asarium 5f23381c07 Merge branch 'master' into antipodes_/sync ...

Conflicts:
	code/cmdline/cmdline.cpp
	code/globalincs/pstypes.h
	code/globalincs/windebug.cpp
	code/graphics/2d.cpp
	code/windows_stub/stubs.cpp

2015-10-31 17:18:29 +01:00

..

encrypt.cpp

Trunk Sync r7856

2011-10-03 13:40:33 +00:00

encrypt.h

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

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

generic_log.cpp

Scripted sort and uniq on (internal) project includes. Improves search time and as a by product removed a number of duplicative includes.

2015-06-22 20:24:30 +10:00

generic_log.h

Trunk sync r9274

2012-10-21 07:58:11 +00:00

lua.cpp

Merge branch 'master' into antipodes_/sync

2015-10-31 17:18:29 +01:00

lua.h

Scripted sort and uniq on (internal) project includes. Improves search time and as a by product removed a number of duplicative includes.

2015-06-22 20:24:30 +10:00

parselo.cpp

Makes vsprintf() stop chopping off the last character. Fixes issue #298.

2015-08-22 03:38:16 -07:00

parselo.h

Scripted sort and uniq on (internal) project includes. Improves search time and as a by product removed a number of duplicative includes.

2015-06-22 20:24:30 +10:00

scripting.cpp

Make script_state::UnloadImages() call bm_release instead of bm_unload.

2015-09-18 21:22:07 -07:00

scripting.h

Merging with new updated master

2015-06-03 17:38:52 -05:00

sexp.cpp

Merge branch 'master' into antipodes_/sync

2015-10-31 17:18:29 +01:00

sexp.h

Fix check_sexp_syntax() so it works properly with OPF_SSM_CLASS.

2015-08-21 13:41:45 -07:00