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

..

lab.cpp

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

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

lab.h

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

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

wmcgui.cpp

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

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

wmcgui.h

Fix unneded check for this != nullptr in wmcgui.h

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