Fredrik Arvidsson 517cf53b76 Merge remote-tracking branch 'origin/next' into thread/OP-1119_Flight_Side_Logs_Plugin ... Conflicts: ground/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp		2013-12-07 17:06:09 +01:00
..
bin	OP-719: fix +x for openpilotgcs on linux	2013-04-14 14:09:46 +03:00
share	OP-1109: port plugins/pfdqml	2013-11-14 00:48:00 +01:00
src	Merge remote-tracking branch 'origin/next' into thread/OP-1119_Flight_Side_Logs_Plugin	2013-12-07 17:06:09 +01:00
copydata.pro	Merge remote-tracking branch 'origin/shared/OP-1109_qtquick2' into next	2013-12-03 22:47:12 +01:00
openpilotgcs.pri	[OP-835] Qt 5.1.0 - fixed ((packed)) pragma issue introduced by MinGW upgrade	2013-09-15 23:39:48 +02:00
openpilotgcs.pro	OP-1103 Some minor cleanup work and adding a version check for Qt5.1	2013-11-13 21:04:57 +11:00