Cyp 7d5f1271a9 Merge remote branch 'origin/master' into newnet ... Conflicts: .gitignore lib/iniparser/Makefile.am macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings		2010-08-14 11:26:09 +02:00
..
base	Merge remote branch 'origin/master' into newnet	2010-08-14 11:26:09 +02:00
mods	remove the lancer rof upgrades to keep the old balance.	2010-06-10 10:53:52 +02:00
mp	Make some internal component names untranslatable.	2010-08-09 09:14:50 +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