Marc Zinnschlag 1d34f5e096 Merge remote-tracking branch 'sirherrbatka/cloning' ... Conflicts: apps/opencs/model/world/refiddata.cpp		2014-01-28 12:40:14 +01:00
..
model	Merge remote-tracking branch 'sirherrbatka/cloning'	2014-01-28 12:40:14 +01:00
view
CMakeLists.txt
editor.cpp
editor.hpp
main.cpp