Marc Zinnschlag 54f56b0515 Merge remote-tracking branch 'graffy76/usersettings' ... Conflicts: apps/opencs/view/doc/view.cpp apps/opencs/view/doc/view.hpp		2013-05-16 18:04:55 +02:00
..
document.cpp	Merge remote-tracking branch 'graffy76/usersettings'	2013-05-16 18:04:55 +02:00
document.hpp	update for master	2013-05-07 20:33:42 -05:00
documentmanager.cpp	constructing documents from a file list instead of a single name	2013-02-04 13:46:54 +01:00
documentmanager.hpp	constructing documents from a file list instead of a single name	2013-02-04 13:46:54 +01:00
state.hpp	moved document state enum to a separate file	2012-12-08 14:44:03 +01:00