asarium 0c705fee6f Merge branch 'master' into antipodes ...

Conflicts:
	code/debugconsole/timerbar.cpp
	code/graphics/gropengl.cpp
	projects/MSVC_2010/code.vcxproj
	projects/MSVC_2012/code.vcxproj
	projects/MSVC_2012/code.vcxproj.filters

2015-05-29 17:47:58 +02:00

..

code.vcproj

Merge branch 'master' into antipodes

2015-05-29 17:47:58 +02:00

Fred2.vcproj

Merge branch 'master' into antipodes

2015-04-25 16:48:43 +02:00

Freespace2.sln

Sync some misc project file differences against trunk.

2013-11-25 18:40:14 +10:00

Freespace2.vcproj

Merge branch 'master' into antipodes

2015-04-25 16:48:43 +02:00

libjpeg.vcproj

pre-Antipodes Staging Merge: "Inferno" build options go away, INF_BUILD settings now "default" settings. Fixed and made consistent across all projects the Build Output names ("Debug" used for Debug builds at the very end of the file name before the extension and after other options such as SSE, where applicable) Other unused #defines or #ifdefs removed: DEMO build Related, STANDALONE_ONLY_BUILD (already covered by -standalone command line flag)

2013-03-18 20:24:46 +10:00

liblua.vcproj

pre-Antipodes Staging Merge: "Inferno" build options go away, INF_BUILD settings now "default" settings. Fixed and made consistent across all projects the Build Output names ("Debug" used for Debug builds at the very end of the file name before the extension and after other options such as SSE, where applicable) Other unused #defines or #ifdefs removed: DEMO build Related, STANDALONE_ONLY_BUILD (already covered by -standalone command line flag)

2013-03-18 20:24:46 +10:00

libpng.vcproj

pre-Antipodes Staging Merge: "Inferno" build options go away, INF_BUILD settings now "default" settings. Fixed and made consistent across all projects the Build Output names ("Debug" used for Debug builds at the very end of the file name before the extension and after other options such as SSE, where applicable) Other unused #defines or #ifdefs removed: DEMO build Related, STANDALONE_ONLY_BUILD (already covered by -standalone command line flag)

2013-03-18 20:24:46 +10:00

wxFRED2.vcproj

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

zlib.vcproj

pre-Antipodes Staging Merge: "Inferno" build options go away, INF_BUILD settings now "default" settings. Fixed and made consistent across all projects the Build Output names ("Debug" used for Debug builds at the very end of the file name before the extension and after other options such as SSE, where applicable) Other unused #defines or #ifdefs removed: DEMO build Related, STANDALONE_ONLY_BUILD (already covered by -standalone command line flag)

2013-03-18 20:24:46 +10:00