Go to file
Cyp 60d7cb6127 Merge remote branch 'origin/master' into qt
Conflicts:
	.hgignore (manual merge)
	lib/framework/wzapp_c.h (used qt)
	macosx/Warzone.xcodeproj/project.pbxproj (used qt)
	po/*.po (used master)
2010-11-21 21:46:08 +01:00
build_tools Update changelog formatting script for git commit hashes. 2010-11-07 19:15:28 +01:00
data Run simplipie over all PIE models. This removes team colour info when tcmask is used in the model and the number of frames is 8. Also fixes some other issues found by simplipie. 2010-11-12 22:55:30 +01:00
doc Test commit 2010-10-04 21:15:46 +02:00
icons Add missing files to the tarball. 2010-08-03 09:38:30 +02:00
lib Merge remote branch 'origin/master' into qt 2010-11-21 21:46:08 +01:00
m4 Improve GLee detection. 2010-04-28 07:52:19 +02:00
macosx Merge remote branch 'origin/master' into qt 2010-11-21 21:46:08 +01:00
makerules Fix exception handler to obey UAC on windows machines. 2010-04-12 11:59:41 +02:00
pkg Fix mod shortcuts for the Windows Installer. 2010-11-15 22:54:42 +01:00
po Spanish translation update by Saberuneko. 2010-11-17 05:43:59 +01:00
src Merge remote branch 'origin/master' into qt 2010-11-21 21:46:08 +01:00
tests Merge remote branch 'origin/master' into qt-trunk 2010-10-09 14:44:15 +02:00
tools simplipie: Remove old style team colour information if tcmask is used. 2010-11-12 22:23:05 +01:00
win32 Merge remote branch 'origin/master' into qt 2010-11-21 21:46:08 +01:00
.bzrignore ln -s .gitignore .bzrignore 2010-02-17 21:50:57 +01:00
.gitattributes Treat the xcode project as a binary. 2010-10-08 18:51:16 -04:00
.gitignore update .gitignore for profiler noise 2010-11-19 23:31:26 -05:00
.hgignore Merge remote branch 'origin/master' into qt 2010-11-21 21:46:08 +01:00
AUTHORS Add sendai nick to myself (as a confusion reducing measure) 2010-05-08 09:30:20 +02:00
COMPILE Fix progress bars, reenable sound test, move variable, remove magic number, comments and spelling. Patch by Safety0ff. 2010-02-09 20:27:41 +01:00
COPYING Create final repository structure. 2007-06-28 17:47:08 +00:00
COPYING.NONGPL Add new backdrop from forum member jorzi. 2010-10-24 19:55:57 +02:00
COPYING.README Warzone 2100, I have the honour to release you from any license unclarities. 2008-06-11 16:38:04 +00:00
ChangeLog Fix some changelog errors 2010-04-18 20:21:18 +02:00
Doxyfile Exclude config-macosx.h and exceptionhandler/include/* from the Doxygen documentation 2008-11-16 16:28:06 +00:00
Makefile.am Remove .svn folders for make dist. 2010-03-13 22:57:23 +01:00
autogen.sh Allow autogen.sh to be executed out-of-tree 2010-01-30 20:26:55 +01:00
autorevision.conf Update files from TRUNK->master 2010-10-30 20:47:36 -04:00
config.rpath Port r3878 and r3879 from trunk/ 2008-03-01 13:04:16 +00:00
configure.ac Merge remote branches 'origin/qt-trunk' and 'origin/master' into qt 2010-10-31 22:27:42 +01:00
fixcppbuild Also fix MSVC *.vcproj files that somehow ended up in lib/ instead of win32/, remove the last part that touches macosx. 2010-10-13 17:49:59 +02:00
makefile.win32 Rename "raw" Makefiles to "win32" Makefiles 2008-07-06 14:29:04 +00:00
newnet.TODO newnet: Make AI research synchronised. Games with AIs now seem to stay in synch. 2010-02-26 21:51:47 +01:00
releaseBranch Fix extra '/'s in previous commit. 2010-11-14 20:28:35 +01:00