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

..

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

string printing safety

2014-10-13 18:23:39 +10:00

generic_log.h

Trunk sync r9274

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

lua.cpp

Merge branch 'master' into antipodes

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

lua.h

Trunk Sync - r10941

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

parselo.cpp

Organizes required_string(); Doxy's required_string() and required_string_one_of()

2015-06-10 09:00:33 -05:00

parselo.h

Improve gamesnd modular parsing

2015-05-08 08:48:17 +02:00

scripting.cpp

Merge branch 'master' into antipodes

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

scripting.h

Merging with new updated master

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

sexp.cpp

Merge pull request #183 from ln-zookeeper/master

2015-06-23 10:16:24 +02:00

sexp.h

Commit because reasons? (Why git, why)

2015-06-03 17:44:37 -05:00