Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
warzone2100/lib/netplay
History
Cyp 23f318fe39 Merge branch 'master' into qt 
Conflicts:
	lib/exceptionhandler/exceptionhandler.vcproj
	lib/framework/frame.h
	lib/framework/framework.vcproj
	lib/framework/input.h
	lib/gamelib/gamelib.vcproj
	lib/iniparser/iniparser.vcproj
	lib/ivis_opengl/ivis_opengl.vcproj
	lib/netplay/netplay.vcproj
	lib/script/script.vcproj
	lib/sequence/sequence.vcproj
	lib/sound/sound.vcproj
	lib/widget/widget.vcproj
	macosx/Warzone.xcodeproj/project.pbxproj (resolved in favour of qt)
	src/Makefile.am
	win32/Warzone2100.vcproj
 		2011-03-22 00:01:28 +01:00
..
miniupnpc Move broken dependency hack out of most Makefile.am's, except the for the root. 2010-12-16 23:14:38 +01:00
Makefile.am Merge remote branch 'origin/master' into qt 2011-01-14 19:26:55 +01:00
makefile.win32 Rename *.c to *.cpp. 2010-12-16 23:28:56 +01:00
netjoin_stub.cpp Bump year. 2011-02-25 18:50:54 +01:00
netlog.cpp fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\| 2011-03-13 12:32:24 +01:00
netlog.h fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\| 2011-03-13 12:32:24 +01:00
netplay.cpp Merge remote branch 'origin/master' into qt 2011-03-13 22:31:19 +01:00
netplay.h fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\| 2011-03-13 12:32:24 +01:00
netplay.vcxproj Initial VS2k10 changes. 2011-03-17 21:35:00 -04:00
netplay.vcxproj.filters Initial VS2k10 changes. 2011-03-17 21:35:00 -04:00
netqueue.cpp newnet: Show relevant players next to connection status icons. 2010-08-01 13:06:50 +02:00
netqueue.h newnet: Save a few more bytes. 2010-07-20 15:40:07 +02:00
netsocket.cpp Bump year. 2011-02-25 18:50:54 +01:00
netsocket.h Change "typedef struct {...} Blah;" into "struct Blah {...};". 2011-02-25 21:30:13 +01:00
nettypes.cpp Merge remote branch 'origin/master' into qt 2011-03-13 22:31:19 +01:00
nettypes.h fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\| 2011-03-13 12:32:24 +01:00