kervala 121bb76b97 Merge with develop		2016-02-23 19:42:49 +01:00
..
cfg	Merge with develop	2015-12-13 21:04:37 +02:00
data	Changed: Updated world_editor_classes.xml	2016-02-21 17:28:43 +01:00
macosx	Removed: installscript_osx.vdf because we manage it directly in code now	2016-01-21 10:15:09 +01:00
src	Merge with develop	2016-02-23 19:42:49 +01:00
unix	Merge with develop	2015-12-29 22:36:04 +01:00
client.cfg	Merge with develop	2015-12-13 21:04:37 +02:00
client_default.cfg	Changed: PatchServer not used anymore, use PatchUrl instead	2016-02-21 17:26:48 +01:00
CMakeLists.txt	Merge with develop	2016-02-02 14:33:32 +01:00