m_thread af9dd99227 Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard ... Conflicts: ground/openpilotgcs/src/plugins/welcome/welcomemode.cpp		2014-09-02 16:44:11 +02:00
..
bin	OP-719: fix +x for openpilotgcs on linux	2013-04-14 14:09:46 +03:00
share	Merge remote-tracking branch 'origin/laurent/OP-1438_VSI_Arc_PFD+Status' into next	2014-08-29 07:00:58 +10:00
src	Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard	2014-09-02 16:44:11 +02:00
copydata.pro	added icu libs to be copied again	2014-08-26 10:30:24 +12:00
openpilotgcs.pri	OP-1461 fix copyqt logic: renamed variables	2014-08-28 08:56:27 +12:00
openpilotgcs.pro	OP-1155 OSX Package: Set QMAKE_MACOSX_DEPLOYMENT_TARGET	2014-01-10 00:44:12 +01:00