Marc Zinnschlag 9221c861c5 Merge remote-tracking branch 'graffy76/next' into next ...

Conflicts:
	apps/opencs/CMakeLists.txt

2013-02-17 17:38:33 +01:00

..

model

Merge branch 'globaltype' into next

2013-02-17 17:27:41 +01:00

view

Merge branch 'globaltype' into next

2013-02-17 17:27:41 +01:00

CMakeLists.txt

Merge remote-tracking branch 'graffy76/next' into next

2013-02-17 17:38:33 +01:00

editor.cpp

a bit of cleanup for the previous commit

2013-02-07 13:13:06 +01:00

editor.hpp

Move OpenDialog to editor and use it in startup dialogue.

2013-02-05 22:06:36 +01:00

main.cpp

fix for the opencs icon

2013-02-17 07:46:50 -06:00