Laurent Lalanne 9e3d464523 Merge branch 'master' into translations_next ... Conflicts: ground/openpilotgcs/copydata.pro ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts		2013-10-25 11:27:28 +02:00
..
app	[OP-835] Qt 5.1.0 - uncrustified gcs sources	2013-10-17 21:45:37 +02:00
experimental	OP-983 fixed minor spelling issues in GCS	2013-06-02 12:42:15 +02:00
libs	Merge branch 'master' into translations_next	2013-10-25 11:27:28 +02:00
plugins	Merge branch 'master' into translations_next	2013-10-25 11:27:28 +02:00
shared	[OP-835] Qt 5.1.0 - migrated shared/qtlockedfile/qtlockedfile_win.cpp	2013-09-15 23:37:21 +02:00
openpilotgcslibrary.pri	Normalize line endings	2013-04-07 09:49:13 +03:00
openpilotgcsplugin.pri	[OP-835] Qt 5.1.0 - all plugins now depend on QT widgets	2013-09-15 23:37:19 +02:00
python.pri	[OP-835] Upgrade toolchain system to Qt 5.1 (Windows only, use packages for Linux and OSX)	2013-09-15 23:24:13 +02:00
rpath.pri	Normalize line endings	2013-04-07 09:49:13 +03:00
src.pro	Normalize line endings	2013-04-07 09:49:13 +03:00