Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
warzone2100/data/base/images
History
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
..
frontend.img Make use of the new scavenger icons. See discussion in ticket:1093 2009-11-23 18:13:25 +01:00
frontend0.png PNG optimization, also known as 'Crush them all!'. 2010-02-09 20:04:21 +01:00
frontend1.png PNG optimization, also known as 'Crush them all!'. 2010-02-09 20:04:21 +01:00
frontend2.png Move base files from data/ into data/base/ (and stuff from warzone.wz to base.wz respecitively). 2008-05-23 21:42:44 +00:00
frontend2.svg Bump copyright 2009-02-10 18:01:48 +00:00
frontend3.png Move base files from data/ into data/base/ (and stuff from warzone.wz to base.wz respecitively). 2008-05-23 21:42:44 +00:00
frontend3.svg Bump copyright 2009-02-10 18:01:48 +00:00
frontend4.png PNG optimization, also known as 'Crush them all!'. 2010-02-09 20:04:21 +01:00
frontend4.svg Bump copyright 2009-02-10 18:01:48 +00:00
intfac.img Merge remote branch 'origin/master' into newnet 2010-06-15 08:35:52 +02:00
intfac0.png Move base files from data/ into data/base/ (and stuff from warzone.wz to base.wz respecitively). 2008-05-23 21:42:44 +00:00
intfac0.svg Bump copyright 2009-02-10 18:01:48 +00:00
intfac1.png Fix size of flashing timer box in campaign. This closes ticket:596 "Time ends warning quad is to small". 2009-06-09 23:44:12 +02:00
intfac1.svg Bump copyright 2009-02-10 18:01:48 +00:00
intfac2.png PNG optimization, also known as 'Crush them all!'. 2010-02-09 20:04:21 +01:00
intfac2.svg Bump copyright 2009-02-10 18:01:48 +00:00
intfac3.png Move base files from data/ into data/base/ (and stuff from warzone.wz to base.wz respecitively). 2008-05-23 21:42:44 +00:00
intfac4.png Move base files from data/ into data/base/ (and stuff from warzone.wz to base.wz respecitively). 2008-05-23 21:42:44 +00:00
intfac5.png Merge remote branch 'origin/master' into newnet 2010-06-15 08:35:52 +02:00