fs2open.github.com

scp-fs2open/fs2open.github.com

0 Fork 0

mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-13 06:21:29 -10:00

Files

T

asarium 1d93fdea2e Merge branch 'master' into antipodes

Conflicts:
	code/freespace2/freespace.cpp
	code/graphics/2d.cpp
	code/network/stand_gui-unix.cpp
	projects/MSVC_2012/Fred2.vcxproj
	projects/MSVC_2012/Freespace2.vcxproj
	projects/MSVC_2013/code.vcxproj
	projects/MSVC_2013/code.vcxproj.filters
	projects/MSVC_2015/Fred2.vcxproj
	projects/MSVC_2015/Freespace2.vcxproj
	projects/MSVC_2015/code.vcxproj

2015-07-03 19:15:43 +02:00

app_icon_glow.ico

Looks like that icon was needed after all.

2009-05-15 17:34:46 +00:00

app_icon.ico

This is more like it. These files diff'd as different than Trunk versions, so I over-rode them with Trunk versions so that Antipodes and Trunk can finally have some 1:1 parity.

2010-09-23 02:14:26 +00:00

app_icon.png

This is more like it. These files diff'd as different than Trunk versions, so I over-rode them with Trunk versions so that Antipodes and Trunk can finally have some 1:1 parity.

2010-09-23 02:14:26 +00:00

dbg_icon.ico

Remove _HAS_ITERATOR_DEBUGGING=0;