Cyp d7db005f71 Merge remote branch 'origin/master' into newnet ... Conflicts: .gitignore configure.ac data/base/images/intfac.img data/base/images/intfac5.png lib/netplay/makefile.win32 lib/netplay/netlog.c lib/netplay/netplay.c lib/netplay/netplay.h lib/netplay/netplay.vcproj macosx/Warzone.xcodeproj/project.pbxproj macosx/configs/Warzone-All.xcconfig po/POTFILES.in src/hci.c src/intfac.h src/keybind.c src/multibot.c src/multiint.c src/multijoin.c src/multiplay.c src/multistruct.c src/multisync.c src/scriptai.c		2010-06-15 08:35:52 +02:00
..
base	Merge remote branch 'origin/master' into newnet	2010-06-15 08:35:52 +02:00
mods	remove the lancer rof upgrades to keep the old balance.	2010-06-10 10:53:52 +02:00
mp	Fix intermittent crash when launching a skirmish game.	2010-05-13 08:03:46 +02:00
music	Add track3.ogg to Makefile.am.	2010-06-03 22:41:44 +02:00
Makefile.am	Check for (un)zip in configure.ac.	2010-04-15 21:38:52 +02:00
makefile.win32	TCMask feature: shaders infrastructure and TCMask shader, FF fallback is supported for TCMask. Part of #851.	2010-03-07 08:34:17 +01:00