f4017eda50
Conflicts: configure.ac lib/netplay/Makefile.am macosx/Warzone.xcodeproj/project.pbxproj src/Makefile.am |
||
---|---|---|
.. | ||
Makefile.am | ||
fonts.conf.wd_disable | ||
fonts.conf.wd_enable | ||
makefile.win32 | ||
warzone2100.nsi | ||
warzone2100.update.nsi |