Merge branch 'master' into qteditor
-rw-r--r-- 18 .git_archival
-rw-r--r-- 133 .gitattributes
-rw-r--r-- 1863 .gitignore
-rw-r--r-- 50601 CMakeLists.txt
-rw-r--r-- 2202 COPYING
-rw-r--r-- 1546 Credits.txt
-rw-r--r-- 2300 README
-rw-r--r-- 913 TRADEMARK
-rw-r--r-- 1103 Version.txt
drwxr-xr-x - cmake
-rw-r--r-- 3333 config.h.cmake
drwxr-xr-x - docs
drwxr-xr-x - include
drwxr-xr-x - licenses
drwxr-xr-x - masterserver
-rw-r--r-- 345 openclonk.desktop
drwxr-xr-x - planet
-rw-r--r-- 85 scriptdefinitionsources.txt
drwxr-xr-x - src
drwxr-xr-x - tests
drwxr-xr-x - thirdparty
drwxr-xr-x - tools