f0beca71cc
Conflicts: lib/netplay/netlog.c lib/netplay/netlog.h lib/netplay/netplay.c macosx/Warzone.xcodeproj/project.pbxproj macosx/configs/Warzone-All.xcconfig macosx/configs/Warzone-Debug.xcconfig src/multijoin.c |
||
---|---|---|
.. | ||
libs | ||
MSVCdelparser.bat | ||
Makefile.am | ||
Warzone2100.sln | ||
Warzone2100.vcproj | ||
Warzone2100.vs2k8.sln | ||
Warzone2100.vs2k8.vcproj | ||
__BUILD_SCRIPT | ||
makefile.win32 | ||
rules.mk | ||
warzone2100.rc | ||
warzone2100.vs2k5.rc | ||
warzone2100.vs2k8.rc |