Merge branch 'master' into 'master' 1/head 16/head
-rw-r--r-- 5635 .cproject
-rw-r--r-- 4655 .gitattributes
-rw-r--r-- 38 .gitignore
-rw-r--r-- 104 .patchsets
-rw-r--r-- 811 .project
-rw-r--r-- 2662 COMPILING
-rw-r--r-- 1805 CONTRIBUTORS
-rw-r--r-- 12473 ChangeLog
-rw-r--r-- 316493 ChangeLog.idsoftware
-rw-r--r-- 1960 DoxyConfig
-rw-r--r-- 45643 Doxyfile
-rw-r--r-- 18011 GPL
-rw-r--r-- 24389 LGPL
-rw-r--r-- 952 LICENSE
-rw-r--r-- 37553 Makefile
-rw-r--r-- 470 Makefile.conf
-rwxr-xr-x 6350 branch-manager
-rw-r--r-- 119 conftest.cpp
drwxr-xr-x - contrib
-rw-r--r-- 214 cross-Makefile.conf
drwxr-xr-x - docs
-rwxr-xr-x 4013 download-gamepacks.sh
-rw-r--r-- 1345 generic_cpp.py
-rw-r--r-- 1439 generic_h.py
-rw-r--r-- 1818 generic_module.py
drwxr-xr-x - icons
drwxr-xr-x - include
-rwxr-xr-x 696 install-dlls-fedora.sh
-rwxr-xr-x 6063 install-dlls.sh
-rwxr-xr-x 1844 install-dylibs.sh
-rwxr-xr-x 448 install-gamepack.sh
-rwxr-xr-x 466 install-gamepacks.sh
drwxr-xr-x - libs
-rwxr-xr-x 1016 merge-from-zerowing.sh
-rw-r--r-- 567 mingw-Makefile.conf
-rw-r--r-- 298 mingw-Makefile.inc
-rw-r--r-- 381 mingw-fedora-Makefile.conf
-rw-r--r-- 708 mingw-radiantdeps-Makefile.inc
drwxr-xr-x - plugins
drwxr-xr-x - radiant
drwxr-xr-x - regression_tests
drwxr-xr-x - setup
drwxr-xr-x - tools
-rw-r--r-- 38924 uncrustify.cfg