Marc Zinnschlag 6eff5ecaad Merge branch 'operations' into load ... Conflicts: apps/opencs/main.cpp apps/opencs/model/doc/document.cpp		2014-05-08 13:17:24 +02:00
..
adjusterwidget.cpp
adjusterwidget.hpp
filedialog.cpp
filedialog.hpp
filewidget.cpp
filewidget.hpp
loader.cpp	handle exceptions thrown during loading and report them to the user	2014-05-06 09:39:39 +02:00
loader.hpp	handle exceptions thrown during loading and report them to the user	2014-05-06 09:39:39 +02:00
newgame.cpp
newgame.hpp
opendialog.cpp
opendialog.hpp
operation.cpp
operation.hpp
operations.cpp
operations.hpp
startup.cpp
startup.hpp
subview.cpp
subview.hpp
subviewfactory.cpp
subviewfactory.hpp
subviewfactoryimp.hpp
view.cpp	Fixed opencs.ini formatting	2014-05-06 07:37:52 -05:00
view.hpp
viewmanager.cpp	handle exceptions thrown during loading and report them to the user	2014-05-06 09:39:39 +02:00
viewmanager.hpp	Merge branch 'master' into load	2014-05-03 14:36:06 +02:00