Philippe Renon
37dab0e4fc
Merge remote-tracking branch 'origin/next' into filnet/telemetry
...
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp
ground/openpilotgcs/src/plugins/coreplugin/telemetrymonitorwidget.cpp
ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp
ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp
2013-12-02 22:54:00 +01:00
Philippe Renon
56c404e778
OP-1132 added new openssl-install that downloads and install the required SSL libraries for Windows
...
the missing SSLEAY32.DLL and LIBEAY32.DLL are copied to GCS bin dir
OpenSSL version 1.0.1e was downloaded from http://slproweb.com/products/Win32OpenSSL.html
2013-12-01 23:17:48 +01:00
Fredrik Arvidsson
2fce485e26
Merge remote-tracking branch 'origin/patrickh/OP-1118_QComboBox_Focus_issue' into next
2013-12-01 10:39:41 +01:00
Alessio Morale
bacc4d3d79
Merge branch 'master' into next
...
Conflicts:
flight/targets/boards/oplinkmini/firmware/pios_board.c
ground/openpilotgcs/copydata.pro
2013-11-25 01:12:10 +01:00
Corvus Corax
1c83d3ee28
BUGFIX to OpLinkMini: oplinkmod needs to initialize the Callback Scheduler
...
OPLMini does not use Systemmod but its own system module called
oplinkmod - which did not initialize the callback scheduler. Making the
event dispatcher a callback caused it to no longer run due to the
missing callback scheduler initialization
2013-11-24 21:24:55 +01:00
Corvus Corax
92f8102597
Merge branch 'corvuscorax/callbackeventdispatcher2' into next
2013-11-19 18:45:42 +01:00
Corvus Corax
7a6c0b61e8
Merge branch 'next' into corvuscorax/callbackeventdispatcher2
2013-11-19 18:36:20 +01:00
Alessio Morale
f36e3d66c1
Merge branch 'bsongis/OP-1099_Hidden_icons_in_configuration_tab' into next
2013-11-18 14:10:58 +01:00
Bertrand Songis
9183e2bb20
Fix for OP-1099: Hidden icons in Configuration tab
2013-11-18 14:10:17 +01:00
Corvus Corax
89f7dab2de
uncrustification for ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h
2013-11-16 17:34:43 +01:00
Corvus Corax
cf5d59a677
uncrustification for ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h
2013-11-16 17:34:43 +01:00
Corvus Corax
31d4234c79
uncrustification for ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h
2013-11-16 17:34:43 +01:00
Corvus Corax
7420276a06
uncrustification for ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h
2013-11-16 17:34:43 +01:00
Corvus Corax
2582eefaed
uncrustification for ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp
2013-11-16 17:34:42 +01:00
Corvus Corax
28d79420c1
uncrustification for ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h
2013-11-16 17:34:42 +01:00
Corvus Corax
f73e2c1a75
uncrustification for ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
0e8f01baa8
uncrustification for ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
e7bd28e14c
uncrustification for ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
436293dbaf
uncrustification for ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
5c6885caf4
uncrustification for ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
68a8863fbd
uncrustification for ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
406daf316c
uncrustification for ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
a21357d8e9
uncrustification for ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp
2013-11-16 17:34:42 +01:00
Corvus Corax
2c04a338b4
uncrustification for ground/openpilotgcs/src/plugins/scope/scopeplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
cef290ddca
uncrustification for ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
04b7fbbf35
uncrustification for ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
9b5c7e20c3
uncrustification for ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
0fd357ae61
uncrustification for ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
4babcedfe2
uncrustification for ground/openpilotgcs/src/plugins/opmap/opmapplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
55eb581e45
uncrustification for ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
df77cd7613
uncrustification for ground/openpilotgcs/src/plugins/notify/notifyplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
2cbe028cd5
uncrustification for ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
cc04e31b5d
uncrustification for ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
bc83fd6ffa
uncrustification for ground/openpilotgcs/src/plugins/logging/loggingplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
3c23b1f464
uncrustification for ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp
2013-11-16 17:34:41 +01:00
Corvus Corax
968470037f
uncrustification for ground/openpilotgcs/src/plugins/logging/logfile.cpp
2013-11-16 17:34:41 +01:00
Corvus Corax
98d213f1a2
uncrustification for ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
33616e6af4
uncrustification for ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
bcc651ddc8
uncrustification for ground/openpilotgcs/src/plugins/importexport/importexportplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
4adca55693
uncrustification for ground/openpilotgcs/src/plugins/hitl/hitlplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
58109f8461
uncrustification for ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
65e8c0dc6f
uncrustification for ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
a499b92d9d
uncrustification for ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
765bd0a7ff
uncrustification for ground/openpilotgcs/src/plugins/dial/dialplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
2e5c179fa4
uncrustification for ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
6030b1ba0a
uncrustification for ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
17da3a6c7a
uncrustification for ground/openpilotgcs/src/plugins/config/configplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
9a753e5c77
uncrustification for ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h
2013-11-16 17:34:39 +01:00
Patrick Huebner
b1fd5db4f5
OP-1118 Fix for QComboBox focus bug in UAVObjectBrowser on Mac OSX
2013-11-16 17:22:51 +11:00
Alessio Morale
6aa63c6e96
Merge remote-tracking branch 'origin/OP-1114_QGLWidget_prohibits_QListWidgetItem_click' into next
2013-11-15 11:43:03 +01:00
