Marc Zinnschlag adb05737ee Merge branch 'master' into filter ... Conflicts: apps/opencs/model/world/universalid.cpp apps/opencs/view/doc/view.cpp apps/opencs/view/world/subviews.cpp		2013-07-30 15:55:50 +02:00
..
filedialog.cpp	Implemented a file dialog for the editor using launcher .ui	2013-03-07 03:00:59 +01:00
filedialog.hpp	Implemented a file dialog for the editor using launcher .ui	2013-03-07 03:00:59 +01:00
opendialog.cpp
opendialog.hpp
operation.cpp	Operations widget height fix and abort button feature. Successfully	2013-02-22 21:53:32 -06:00
operation.hpp	Operations widget height fix and abort button feature. Successfully	2013-02-22 21:53:32 -06:00
operations.cpp	Merge branch 'master' into saveOnClose	2013-03-02 09:24:42 -06:00
operations.hpp	Operations widget height fix and abort button feature. Successfully	2013-02-22 21:53:32 -06:00
startup.cpp	update for master	2013-05-07 20:33:42 -05:00
startup.hpp
subview.cpp	added optional per-subview status bar	2013-07-25 14:29:56 +02:00
subview.hpp	added optional per-subview status bar	2013-07-25 14:29:56 +02:00
subviewfactory.cpp
subviewfactory.hpp
subviewfactoryimp.hpp	minor cleanup; less pointer usage	2013-07-26 12:42:15 +02:00
view.cpp	Merge branch 'master' into filter	2013-07-30 15:55:50 +02:00
view.hpp	Merge branch 'master' into filter	2013-07-30 15:55:50 +02:00
viewmanager.cpp	Repo permissions commit fix #2	2013-07-10 21:13:59 -05:00
viewmanager.hpp	Final changes for record status icon feature, incl. window size user	2013-06-20 18:06:25 -05:00