Marc Zinnschlag 2c1cee38b4 Merge remote-tracking branch 'smbas/feature-extended-configurator'		2015-07-28 07:56:12 +02:00
..
model	Merge remote-tracking branch 'smbas/feature-extended-configurator'	2015-07-28 07:56:12 +02:00
view	Merge remote-tracking branch 'smbas/feature-extended-configurator'	2015-07-28 07:56:12 +02:00
CMakeLists.txt	Update to upstream/master. Resolve merge conflicts	2015-07-27 13:54:13 +03:00
editor.cpp
editor.hpp
main.cpp