Philippe Renon 5bc17d7b87 Merge remote-tracking branch 'origin/thread/OP-1071_Map_Emergency_Line' into next ... Conflicts: ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointcircle.cpp ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointline.cpp		2015-01-31 15:35:07 +01:00
..
antennatrack	git merge next	2013-12-18 20:14:26 +01:00
config	OP-1668 Adjusting layout.	2015-01-28 00:41:11 +01:00
consolegadget	Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES	2013-05-19 17:37:30 +03:00
coreplugin	Fixed a gcc compiler warning that was a result of clang compiler warning cleanup.	2014-12-30 09:41:37 +01:00
debuggadget	Merge remote-tracking branch 'origin/next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI	2014-03-08 10:50:32 +01:00
dial	git merge next	2013-12-18 20:14:26 +01:00
donothing	Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES	2013-05-19 17:37:30 +03:00
emptygadget	git merge next	2013-12-18 20:14:26 +01:00
flightlog	OP-1395 - Remove Qt::Dialog flag as it is misbehaving in linux	2014-07-14 11:06:35 +02:00
gcscontrol	Merge remote-tracking branch 'origin/next' into shared/OP-1252_update_to_qt521	2014-04-08 11:31:23 +02:00
gpsdisplay	OP-1543 Fix font used for sat numbers	2014-11-28 22:29:04 +01:00
hitl	fixed header guards	2014-12-30 17:48:56 +13:00
importexport	OP-1337 French translations updates	2014-05-10 11:56:24 +02:00
ipconnection	git merge next	2013-12-18 20:14:26 +01:00
lineardial	Merge remote-tracking branch 'origin/next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI	2014-03-08 10:50:32 +01:00
logging	OP-1077 Prevent GCS flight log corruption when no flight log is chosen	2014-09-03 21:19:15 +02:00
magicwaypoint	OP-1538 Fixed some runtime warnings and debug logging.	2014-10-15 00:41:17 +02:00
modelview	git merge next	2013-12-18 20:14:26 +01:00
notify	Merge remote-tracking branch 'origin/next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI	2014-03-08 10:50:32 +01:00
ophid	OP-1398 OP-1399 Windows Qt 5.3.1 upgrade - removed duplicate method declarations in ophid header (were added in standard hidsdi.h header?)	2014-07-14 18:26:41 +02:00
opmap	Merge remote-tracking branch 'origin/thread/OP-1071_Map_Emergency_Line' into next	2015-01-31 15:35:07 +01:00
osgearthview	git merge next	2013-12-18 20:14:26 +01:00
pathactioneditor	OP-1558 Remove empty resource file.	2014-10-28 00:44:02 +01:00
pfdqml	Merge remote-tracking branch 'origin/laurent/OP-1648_PFD_flight_mode_update' into next	2015-01-07 14:09:45 +01:00
qmlview	fixed header guards	2014-12-30 17:48:56 +13:00
scope	OP-1611 Uncrustify	2014-11-15 11:07:32 +01:00
serialconnection	Merge remote-tracking branch 'origin/shared/OP-1398_qt531_upgrade' into thread/OP-1400_Qt_5.3.1_Upgrade	2014-08-11 23:25:37 +02:00
setupwizard	OP-1628 Fixed some review issues. Updated some text.	2015-01-27 08:43:06 +01:00
systemhealth	OP-1662 Add info for Stack alarm	2015-01-05 20:49:04 +01:00
telemetry	OP-1568 Fixes transparent background issue that causes black tooltip - Telemetry monitor a little bigger	2014-10-24 15:10:52 +02:00
uavobjectbrowser	uncrusty	2014-10-21 18:56:05 +11:00
uavobjects	gpsassist:code review comments	2015-01-09 07:51:37 +11:00
uavobjectutil	Merge remote-tracking branch 'origin/skarlsso/OP-1493_discoveryf4bare_support_in_gcs' into next	2014-09-23 21:11:15 +10:00
uavobjectwidgetutils	fixed comparison	2014-12-30 17:52:47 +13:00
uavsettingsimportexport	OP-1337 French translations updates	2014-05-10 11:56:24 +02:00
uavtalk	OP-1628 Uncrustify	2015-01-26 23:03:39 +01:00
uploader	OP-1628 Adjusting some form labels.	2015-01-30 16:40:36 +01:00
welcome	OP-1647 Welcome QML error: removed parent horiz align	2014-12-10 10:30:23 +13:00
plugins.pro	OP-1174 fixed GCS telemetry build dependency issue	2014-05-11 14:20:31 +02:00