Marc Zinnschlag 6a2fe564ef Merge branch 'master' into move		2016-03-11 12:47:33 +01:00
..
model
view	Merge branch 'master' into move	2016-03-11 12:47:33 +01:00
CMakeLists.txt	Merge branch 'master' into move	2016-03-11 12:47:33 +01:00
editor.cpp
editor.hpp
main.cpp