Marc Zinnschlag 5b9e90744e Merge branch 'load'		2014-05-10 13:49:25 +02:00
..
model	Merge branch 'load'	2014-05-10 13:49:25 +02:00
view	improved layout of loading window	2014-05-10 13:29:28 +02:00
CMakeLists.txt	Merge branch 'operations' into load	2014-05-08 13:17:24 +02:00
editor.cpp	Merge branch 'operations' into load	2014-05-08 13:17:24 +02:00
editor.hpp	Merge branch 'master' into load	2014-05-03 14:36:06 +02:00
main.cpp	Merge branch 'operations' into load	2014-05-08 13:17:24 +02:00