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

..

antennatrack

uncrustification for ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h

2013-11-16 17:34:39 +01:00

config

uncrustification for ground/openpilotgcs/src/plugins/config/configplugin.h

2013-11-16 17:34:40 +01:00

consolegadget

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

coreplugin

uncrustification

2013-12-07 15:25:15 +01:00

debuggadget

uncrustification for ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h

2013-11-16 17:34:40 +01:00

dial

uncrustification for ground/openpilotgcs/src/plugins/dial/dialplugin.h

2013-11-16 17:34:40 +01:00

donothing

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

emptygadget

uncrustification for ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h

2013-11-16 17:34:40 +01:00

flightlog

OP-1119 Added option to base log flight time on the time when log started, not when the board was booted.

2013-12-01 21:22:58 +01:00

gcscontrol

uncrustification for ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h

2013-11-16 17:34:40 +01:00

gpsdisplay

uncrustification for ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h

2013-11-16 17:34:40 +01:00

hitl

uncrustification for ground/openpilotgcs/src/plugins/hitl/hitlplugin.h

2013-11-16 17:34:40 +01:00

importexport

uncrustification for ground/openpilotgcs/src/plugins/importexport/importexportplugin.h

2013-11-16 17:34:40 +01:00

ipconnection

uncrustification for ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h

2013-11-16 17:34:40 +01:00

lineardial

uncrustification for ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h

2013-11-16 17:34:41 +01:00

logging

OP-1119 Moved class LogFile from Logging plugin to libs/utils

2013-11-27 16:07:15 +01:00

magicwaypoint

uncrustification for ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h

2013-11-16 17:34:41 +01:00

modelview

uncrustification for ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h

2013-11-16 17:34:41 +01:00

notify

uncrustification for ground/openpilotgcs/src/plugins/notify/notifyplugin.h

2013-11-16 17:34:41 +01:00

ophid

uncrustification for ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h

2013-11-16 17:34:41 +01:00

opmap

uncrustification for ground/openpilotgcs/src/plugins/opmap/opmapplugin.h

2013-11-16 17:34:41 +01:00

osgearthview

uncrustification for ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h

2013-11-16 17:34:41 +01:00

pathactioneditor

uncrustification for ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h

2013-11-16 17:34:41 +01:00

pfdqml

uncrustification

2013-12-07 15:25:15 +01:00

qmlview

uncrustification

2013-12-07 15:25:15 +01:00

scope

uncrustification for ground/openpilotgcs/src/plugins/scope/scopeplugin.h

2013-11-16 17:34:42 +01:00

serialconnection

uncrustification for ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h

2013-11-16 17:34:42 +01:00

setupwizard

OP-1063 Fixed text

2013-12-03 22:03:32 +01:00

systemhealth

uncrustification for ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h

2013-11-16 17:34:42 +01:00

uavobjectbrowser

uncrustification

2013-12-07 15:25:15 +01:00

uavobjects

OP-1119 Code cleanup and more uncrustification

2013-11-26 16:06:12 +01:00

uavobjectutil

uncrustification for ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h

2013-11-16 17:34:42 +01:00

uavobjectwidgetutils

uncrustification for ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h

2013-11-16 17:34:42 +01:00

uavsettingsimportexport

uncrustification for ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h

2013-11-16 17:34:42 +01:00

uavtalk

uncrustification for ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h

2013-11-16 17:34:43 +01:00

uploader

uncrustification for ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h

2013-11-16 17:34:43 +01:00

welcome

uncrustification

2013-12-07 15:25:15 +01:00

plugins.pro

OP-1119 Starting to implement the export functionality. Aiming to do it so it is compatible with the standard .opl file format and replayable in the logging plugin.

2013-11-26 23:45:38 +01:00