Go to file
dak180 d9010d186f Hopefully make it so conflicts in the xcode project files are automatically resolved.
This is done by making them not actually merge (it still will need to be done though just by hand on a platform where it can be tested).
2012-02-03 23:40:24 -05:00
3rdparty Add OS X help menu items for the man page and scripting docs. 2012-02-01 16:30:29 -06:00
build_tools Fix calling batch file for autorevision.sh script refs: 17596232cc 2012-02-03 21:13:54 -05:00
data Merge branch 'bugfixes' 2012-02-04 05:32:40 +01:00
doc qtscript: Add a note about local variables to the documentation. 2012-02-03 23:56:38 +01:00
icons Update custom translations. 2012-01-29 19:35:53 +01:00
lib Fix player counts for both AI & humans & 'closed' slots in MP games 2012-02-03 21:13:56 -05:00
m4 Fix pthread detection on Fedora. 2012-01-15 00:31:39 +01:00
macosx Fix the help bundle. 2012-02-01 23:57:39 -05:00
pkg Sync up the NSIS file. 2011-10-29 21:05:03 -04:00
po Polish translation update by Emdek. 2012-01-29 19:56:42 +01:00
src Merge branch 'bugfixes' 2012-02-04 05:32:40 +01:00
tests Disable building qslint for now. 2011-12-31 00:49:13 +01:00
tools Update the ticketvalidemail plugin to work as part of the spam filter. 2012-01-26 22:54:09 -05:00
win32 Update MSVC solution for building both SDL & Qt backends. 2012-01-07 01:33:40 -05: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 update .gitignore 2012-01-07 01:33:41 -05:00
.hgignore Merge remote branch 'origin/master' into qt 2010-11-21 21:46:08 +01:00
AUTHORS Includes the cacert root cert within dpkg and nsis packages. 2011-05-02 22:15:20 +02: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 Update wall model to fix z-fighting, change license to GPL. 2011-09-28 14:31:04 -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 Splice in the Changelog from 2.3. 2012-02-03 23:38:34 +01:00
Doxyfile Small update of the Doxygen files. 2011-09-16 22:24:51 +02:00
Makefile.am Integrate QuesoGLC. 2012-01-08 22:53:42 +01:00
autogen.sh autogen.sh always instructs user to run configure in current directory - even 2011-09-06 21:15:18 -04:00
config.rpath Port r3878 and r3879 from trunk/ 2008-03-01 13:04:16 +00:00
configure.ac Revert the new bsonlobby. 2012-01-08 23:10:26 +01: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
fixcppbuild Make everything compile successfully with g++, without -fpermissive. 2010-12-16 23:24:40 +01: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 Simplify usage of version_getVersionString(). 2012-01-12 19:56:02 +01:00