asarium c6e7087b60 Merge branch 'master' into antipodes ...

Conflicts:
	code/graphics/2d.cpp
	projects/MSVC_2013/code.vcxproj.filters

2015-05-12 20:34:35 +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;

2009-11-12 16:40:27 +00:00

freespace.cpp

Merge branch 'master' into antipodes

2015-05-12 20:34:35 +02:00

freespace.h

Trunk Sync - r10935

2014-09-11 19:22:13 +10:00

freespace.rc

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11309 387891d4-d844-0410-90c0-e4c51a9137d3

2015-04-18 18:12:04 +10:00

freespaceresource.h

standalone changes:

2008-11-11 01:09:01 +00:00

goal_com.bmp

Volition sources -- warpcore CVS import

2002-06-03 03:26:03 +00:00

goal_fail.bmp

Volition sources -- warpcore CVS import

2002-06-03 03:26:03 +00:00

goal_inc.bmp

Volition sources -- warpcore CVS import

2002-06-03 03:26:03 +00:00

goal_none.bmp

Volition sources -- warpcore CVS import

2002-06-03 03:26:03 +00:00

goal_ord.bmp

Volition sources -- warpcore CVS import

2002-06-03 03:26:03 +00:00

levelpaging.cpp

Trunk sync r7997

2011-11-16 18:16:55 +00:00

levelpaging.h

The big CVS comment removal. This chops approx. 3.5mb off a full checkout.

2009-06-20 08:08:20 +00:00

V_app.ico

Remove _HAS_ITERATOR_DEBUGGING=0;

2009-11-12 16:40:27 +00:00

V_debug.ico

Remove _HAS_ITERATOR_DEBUGGING=0;

2009-11-12 16:40:27 +00:00

V_sse-d.ico

Remove _HAS_ITERATOR_DEBUGGING=0;

2009-11-12 16:40:27 +00:00

V_sse.ico

Remove _HAS_ITERATOR_DEBUGGING=0;

2009-11-12 16:40:27 +00:00