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
..
model	Merge branch 'master' into filter	2013-07-30 15:55:50 +02:00
view	Merge branch 'master' into filter	2013-07-30 15:55:50 +02:00
CMakeLists.txt	Merge branch 'master' into filter	2013-07-30 15:55:50 +02:00
editor.cpp	Final changes for record status icon feature, incl. window size user	2013-06-20 18:06:25 -05:00
editor.hpp	Globalization of user settings	2013-06-12 12:36:35 +02:00
main.cpp	fix for the opencs icon	2013-02-17 07:46:50 -06:00
ocspropertywidget.cpp	update for master	2013-05-07 20:33:42 -05:00
ocspropertywidget.hpp	update for master	2013-05-07 20:33:42 -05:00