Stacey Sheldon 127ca1e7e1 Merge remote-tracking branch 'op-public/next' into revo-next ... Conflicts: ground/openpilotgcs/src/plugins/hitl/plugin.pro ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp ground/openpilotgcs/src/plugins/hitlnew/simulator.h ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro		2012-10-20 13:56:18 -04:00
..
linux	Fixed borkage in the rules file where the if test was malformed. Added	2012-01-04 21:39:23 -07:00
osx	OSX packaging: Finally link SDL in properly.	2012-10-13 18:03:18 +01:00
winx86	Windows Uninstaller: remove GCS config files (including obsolete) on demand	2012-10-16 01:14:11 +03:00
Makefile	Merge remote-tracking branch 'op-public/next' into revo-next	2012-10-20 13:56:18 -04:00
Makefile.linux	Allow building an unsigned linux package until we have official OP signing keys	2012-07-18 17:01:39 -05:00
Makefile.osx	OSX Packaging: Go back to release configuration for build	2011-08-04 20:54:59 -05:00
Makefile.winx86	package: now it is called 'make package' instead of 'make release'	2011-05-28 03:14:51 +03:00