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

whitespaces removed again.

2014-01-27 19:47:54 +01:00

CMakeLists.txt

Merge remote-tracking branch 'sirherrbatka/referencables_verifer'

2014-01-15 14:29:54 +01:00

editor.cpp

XDG compliant paths

2013-12-26 20:53:51 +01:00

editor.hpp

Fix for file path issues

2013-10-26 22:55:44 -05:00

main.cpp

Change destruction order - fixes a shutdown crash discovered with mesa

2013-12-26 20:53:52 +01:00