Marc Zinnschlag 3f0a49a2f6 Merge branch 'master' into startup ... Conflicts: apps/opencs/CMakeLists.txt		2013-02-04 10:22:37 +01:00
..
model	Merge branch 'globals'	2013-01-22 11:47:24 +01:00
view	added provisional startup dialogue	2013-02-02 16:14:58 +01:00
CMakeLists.txt	Merge branch 'master' into startup	2013-02-04 10:22:37 +01:00
editor.cpp	added provisional startup dialogue	2013-02-02 16:14:58 +01:00
editor.hpp	added provisional startup dialogue	2013-02-02 16:14:58 +01:00
main.cpp	improved exception handling	2012-12-04 20:43:47 +01:00