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
..
filedialog.cpp
filedialog.hpp
opendialog.cpp
opendialog.hpp
operation.cpp
operation.hpp
operations.cpp
operations.hpp
startup.cpp	update for master	2013-05-07 20:33:42 -05:00
startup.hpp
subview.cpp
subview.hpp
subviewfactory.cpp
subviewfactory.hpp
subviewfactoryimp.hpp
view.cpp	Merge remote-tracking branch 'graffy76/usersettings'	2013-05-16 18:04:55 +02:00
view.hpp	Merge remote-tracking branch 'graffy76/usersettings'	2013-05-16 18:04:55 +02:00
viewmanager.cpp	Merge remote-tracking branch 'graffy76/usersettings'	2013-05-16 18:04:55 +02:00
viewmanager.hpp