asarium e08ba026f8 Merge branch 'master' into antipodes_/sync ...

Conflicts:
	.travis.yml
	code/cmdline/cmdline.cpp
	code/fs2netd/fs2netd_client.cpp
	code/fs2netd/tcp_client.cpp
	code/globalincs/pstypes.h
	code/graphics/2d.cpp
	code/graphics/2d.h
	code/parse/lua.cpp
	code/parse/scripting.cpp
	code/windows_stub/stubs.cpp
	configure.ac
	projects/MSVC_2012/Freespace2.vcxproj
	projects/MSVC_2012/code.vcxproj
	projects/MSVC_2013/code.vcxproj
	projects/MSVC_2015/code.vcxproj

2015-08-24 12:10:16 +02:00

..

button.cpp

Merge branch 'master' into antipodes_/sync

2015-08-24 12:10:16 +02:00

checkbox.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

gadget.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

icon.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

inputbox.cpp

Merge branch 'master' into antipodes_/sync

2015-08-24 12:10:16 +02:00

keytrap.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

listbox.cpp

Simplify duplicative ui/ includes.

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

radio.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

scroll.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

slider2.cpp

Merge pull request #195 from Echelon9/fix/sort-uniq-includes

2015-08-19 00:05:02 -04:00

slider.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

ui.h

Merge branch 'master' into antipodes

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

uidefs.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

uidraw.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

uimouse.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

window.cpp

Simplify duplicative ui/ includes.

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