Laurent Lalanne bdbbaa4f93 Merge branch 'next' into translations_next ... Conflicts: ground/openpilotgcs/src/libs/utils/logfile.cpp ground/openpilotgcs/src/libs/utils/logfile.h ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.cpp ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.h ground/openpilotgcs/src/plugins/telemetry/monitorwidget.h ground/openpilotgcs/src/plugins/telemetry/telemetry_global.h		2013-12-23 13:02:27 +01:00
..
aggregation	Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES	2013-05-19 17:37:30 +03:00
eigen	tools: make uncrustify_install target, script and base config file	2013-04-22 21:35:25 +02:00
extensionsystem	[OP-835] Qt 5.1.0 - migrated GCS libs/extensionsystem	2013-09-15 23:35:15 +02:00
glc_lib	[OP-835] Qt 5.1.0 - disabled all compilation warnings for glc_lib and qwt libs as both use imported sources	2013-09-20 22:58:18 +02:00
juavobjects	git merge next	2013-12-18 20:14:26 +01:00
juavtalk	adding juavtalk	2011-04-09 04:32:26 +00:00
opmapcontrol	Merge branch 'master' into translations_next	2013-10-25 11:27:28 +02:00
qscispinbox	[OP-835] Qt 5.1.0 - migrated GCS libs/qscispinbox	2013-09-15 23:36:52 +02:00
qtconcurrent	[OP-835] Qt 5.1.0 - migrated GCS libs/qtconcurrent	2013-09-15 23:37:18 +02:00
qwt	[OP-835] Qt 5.1.0 - disabled all compilation warnings for glc_lib and qwt libs as both use imported sources	2013-09-20 22:58:18 +02:00
sdlgamepad	git merge next	2013-12-18 20:14:26 +01:00
utils	git merge next	2013-12-18 20:14:26 +01:00
version_info	OP-910: move PYTHON definition to a qmake include file for easy reuse	2013-06-05 16:00:43 +03:00
libs.pro	[OP-835] Qt 5.1.0 - removed libqxt and qextserialport libraries as they are now included in Qt	2013-09-15 23:34:59 +02:00