MageKing17 64c9b272e7 Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info ...

Conflicts:
	code/pilotfile/pilotfile.cpp

2015-08-19 11:53:25 -07:00

..

csg_convert.cpp

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

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

csg.cpp

Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info

2015-08-19 11:53:25 -07:00

pilotfile_convert.cpp

Simplify duplicative pilotfile/ includes, which are in pilotfile/pilotfile.h

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

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

pilotfile.cpp

Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info

2015-08-19 11:53:25 -07:00

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

plr_convert.cpp

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

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

plr.cpp

Fix format warning in plr.cpp

2015-08-19 11:26:30 +02:00