Go to file
vexed f29d13b4e8 Merge branch 'newbugfixes'
Conflicts:
	data/mp/stats/weapons.txt
	src/Makefile.am
	src/ai.h
2013-12-07 21:26:19 -05:00
3rdparty Merge branch 'bugfixes' 2013-10-27 21:15:49 -04:00
build_tools K.I.S.S 2013-12-03 20:58:01 -05:00
data Merge branch 'newbugfixes' 2013-12-07 21:26:19 -05:00
doc Merge branch 'bugfixes' 2013-11-19 22:18:46 -05:00
icons Update POTFILES.in and custom translations. 2013-11-04 14:37:12 +01:00
lib Update MSVC build refs: e9643818d1 2013-12-07 18:53:40 -05:00
m4 Fix pthread detection on Fedora. 2012-01-15 00:31:39 +01:00
macosx Remove deleted files from the mac build. 2013-12-01 09:43:36 -05:00
pkg Portable Warzone fixes for windows. 2013-10-30 20:06:26 -04:00
po Merge branch 'newbugfixes' 2013-12-07 21:26:19 -05:00
src Merge branch 'newbugfixes' 2013-12-07 21:26:19 -05:00
tests Add unit test to prevent new dependencies from lib/framework to src/ from being added undetected. 2013-12-01 23:52:46 +01:00
tools Update Qt to 4.8.4 for mac builds. 2013-08-01 16:48:43 -04:00
win32 Portable Warzone fixes for windows. 2013-10-30 20:06:26 -04:00
.bzrignore ln -s .gitignore .bzrignore 2010-02-17 21:50:57 +01:00
.gitattributes Hopefully make it so conflicts in the xcode project files are automatically resolved. 2012-02-03 23:40:24 -05:00
.gitignore Merge branch 'bugfixes' 2013-10-07 08:00:05 +02:00
.hgignore Merge remote branch 'origin/master' into qt 2010-11-21 21:46:08 +01:00
AUTHORS Updated textures by Christian Scholz (cnceo) 2013-12-01 20:30:42 +01:00
COMPILE Replace the outdated content of COMPILE with a pointer at the wiki. 2011-05-14 18:09:40 +02:00
COPYING Create final repository structure. 2007-06-28 17:47:08 +00:00
COPYING.NONGPL New skybox for urban maps. 2012-06-10 00:14:32 -04: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 Update changelog for 3.1.1 RC3 2013-11-23 20:04:30 -05:00
Doxyfile Small update of the Doxygen files. 2011-09-16 22:24:51 +02:00
Makefile.am Merge branch 'newbugfixes' 2013-12-07 21:26:19 -05:00
autogen.sh Simplify build process by getting rid of bison/flex dependencies. 2013-09-21 00:14:02 +02:00
config.rpath Port r3878 and r3879 from trunk/ 2008-03-01 13:04:16 +00:00
configure.ac Portable Warzone fixes for windows. 2013-10-30 20:06:26 -04:00
fixbrokendependencies Move broken dependency hack out of most Makefile.am's, except the for the root. 2010-12-16 23:14:38 +01:00
releaseBranch Simplify usage of version_getVersionString(). 2012-01-12 19:56:02 +01:00