rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-04 12:24:11 +01:00
Code Issues Releases Activity
12,668 Commits 5 Branches 8 Tags 266 MiB
4c58675fc3
Commit Graph

438 Commits

Author SHA1 Message Date
Laurent Lalanne
38a74431bf OP-1564 Fix regression introduced with Acro+ 2014-10-23 10:31:11 +02:00
Laurent Lalanne
e3252d6996 OP-1337 Last translations changes 2014-10-18 19:38:15 +02:00
Laurent Lalanne
a5648ede29 OP-1337 Integral tooltips : font size issue fixed in stabilization.ui 2014-10-18 11:06:07 +02:00
Laurent Lalanne
747f001e22 OP-1337 Minor updates - Cleannup (remove obsoletes) 2014-10-15 14:24:41 +02:00
Laurent Lalanne
bedada44b8 OP-1337 Translations updates : Esc calibration, Expo... 2014-10-13 11:40:55 +02:00
Laurent Lalanne
72a5cd67cc OP-1337 Translations updates 2014-10-12 21:28:52 +02:00
Laurent Lalanne
f27b35f71b OP-1337 Updates 2014-10-02 00:26:39 +02:00
Laurent Lalanne
002cd10cd8 OP-1337 Export template fixes 2014-09-30 22:31:54 +02:00
Laurent Lalanne
9760495899 OP-1337 Typo fix (Wizard-fixedwingpage.cpp) - Translations updates 2014-09-30 20:58:11 +02:00
Laurent Lalanne
20300b7beb Merge remote-tracking branch 'origin/next' into laurent/OP-1337_French_translations_updates 2014-09-25 19:06:42 +02:00
Laurent Lalanne
565c86060f OP-1506 Remove Svg gradient, now draw in qml (linear from middle). Remove Vsi scale background. 2014-09-24 20:54:54 +02:00
Laurent Lalanne
95db735063 OP-1506 Speed, altitude and vertical speed units in cyan 2014-09-24 19:49:06 +02:00
Laurent Lalanne
ca3b74bdf4 OP-1506 Auto-select Vsi unit and scale from altitude unit : m/s or ft/s 2014-09-24 19:19:21 +02:00
Laurent Lalanne
27f0e06780 OP-1506 Wrong_display_alt_speed : Fix wrong scale display for speed and altitude. Hide scales (because do nothing) if no units defined in options km/h, m/s, knots, miles/h (speed) or meter / ft (altitude) 2014-09-24 17:49:22 +02:00
Laurent Lalanne
e320e9782d OP-1337 Pid Scaling translation 2014-09-23 23:41:33 +02:00
Laurent Lalanne
762c24ed7e Merge remote-tracking branch 'origin/next' into laurent/OP-1337_French_translations_updates 2014-09-23 22:56:55 +02:00
Laurent Lalanne
46dbf46f05 OP-1435 System Tab : Font size issue 2014-09-23 01:02:34 +02:00
Laurent Lalanne
e5ab845170 OP-1337 Translations for download/upload PathPlan 2014-09-20 10:52:03 +02:00
Laurent Lalanne
9c18917297 OP-1435 Small fixes. Common background color for Volt/Amp, display Lipo alarm if NbCells is defined. 2014-09-20 02:01:05 +02:00
Laurent Lalanne
d31c8bff9c OP-1435 V/A/Consumed displayed on top if Battery module enabled and no PathPlan 2014-09-19 22:45:53 +02:00
Laurent Lalanne
0742eb6b77 OP-1435 System tab : Right aligned text 2014-09-19 00:00:37 +02:00
Laurent Lalanne
7d110d7122 OP-1435 System tab update : FusionAlgorithm, Mag used and Gpstype 2014-09-18 23:25:47 +02:00
Laurent Lalanne
e464983cfe Merge remote-tracking branch 'origin/next' into laurent/OP-1435_Add_more_info_PFD 2014-09-16 21:54:45 +02:00
Laurent Lalanne
a412f612ed OP-1337 French_translations_updates : Added some translations 2014-09-15 15:39:03 +02:00
Laurent Lalanne
956e5ad9d0 OP-1435 Add_more_info_PFD : Smeter jitter free when OPLink is really connected 2014-09-09 22:32:28 +02:00
Laurent Lalanne
ac16c2722c OP-1435 Add_more_info_PFD : Increase timer value, remove jitter. Tx/rx rates should be updated every 500ms. 2014-09-09 20:47:36 +02:00
Laurent Lalanne
b7a348e7c3 OP-1435 Add_more_info_PFD : Total distance counter always visible. Check telemetry activity for link status (Smeter real or log replay) 2014-09-09 20:27:01 +02:00
Laurent Lalanne
20218a0788 OP-1435 Add_more_info_PFD : Add FrameType, Cpuload/temp, MemFree to SystemTab 2014-09-07 20:29:31 +02:00
Fredrik Larrson
11a4a249b8 Merge remote-tracking branch 'origin/skarlsso/OP-1459_workaround_white-box_issue' into next 2014-09-08 02:33:39 +10:00
Laurent Lalanne
fd9700b578 OP-1435 Add_more_info_PFD Changes in panel functions + removed spaces 2014-09-02 01:28:27 +02:00
Laurent Lalanne
81999ced23 OP-1435 Add_more_info_PFD Follow up to previous review. Added Panels.qml, System tab panel, new behavior for panels with close icon. 2014-09-02 00:21:38 +02:00
Fredrik Larson
41ecbc3eba Merge remote-tracking branch 'origin/laurent/OP-1438_VSI_Arc_PFD+Status' into next 2014-08-29 07:00:58 +10:00
Laurent Lalanne
093d06b7a4 OP-868 Text_in_Barographs : Add space in vertical Barograph 2014-08-26 21:54:44 +02:00
Stefan Karlsson
52420c2ed6 OP-1459 Turn off useOpenGL by default in OPMapGadget 2014-08-25 19:15:03 +02:00
Laurent Lalanne
c4e1400355 OP-1438 VSI_Arc_PFD+Status Info.qml cleanup, added comments. 2014-08-24 23:43:13 +02:00
Laurent Lalanne
72c3d3e9c1 OP-1438 VSI_Arc_PFD+Status : Display OPLinkID as hex value, all uppercase. 2014-08-24 00:23:39 +02:00
Laurent Lalanne
f1989ad468 OP-1438 VSI_Arc_PFD+Status : Renamed System tab as OPLM tab panel, added buttons and OplmId 2014-08-24 00:08:48 +02:00
Laurent Lalanne
ed9f0fcf86 OP-1438 VSI_Arc_PFD+Status : Add system / info panel, work in progress. Currently only Smeter on first Oplm. 2014-08-23 09:41:59 +02:00
Laurent Lalanne
00b8fea565 OP-1438_VSI Arc_PFD+Status : Master Caution alarm, white font 2014-08-23 09:40:33 +02:00
Laurent Lalanne
8b6b64512f OP-1438 VSI_Arc_PFD+Status : Bugfix, MouseArea was active on hidden background panel. 2014-08-22 16:19:07 +02:00
Laurent Lalanne
8eab7400b7 OP-1438 VSI_Arc_PFD+Status : DemiBold font weight on top 2014-08-22 13:57:03 +02:00
Laurent Lalanne
3e92a26f87 OP-1438 VSI_Arc_PFD+Status Bottom alarms a little bigger 2014-08-21 23:12:44 +02:00
Laurent Lalanne
c8cd749692 OP-1438 VSI_Arc_PFD+Status Refactored PFD for best viewing on small devices / laptops. Battery panel added on left 2014-08-21 14:28:17 +02:00
Laurent Lalanne
501a59fcdc OP-1438 VSI_Arc_PFD+Status : Display Vsi waypoint with guided flymodes only. Check AirframeType for FW/VTOL pathfollower use. 2014-08-20 15:18:54 +02:00
Fredrik Larson
e51529d025 Update default layout config 2014-08-20 22:22:47 +10:00
Laurent Lalanne
a00de4aaae OP-1438 VSI_Arc_PFD+Status : Bigger Rcinput panel for best viewing 2014-08-20 13:36:05 +02:00
Laurent Lalanne
8447f474fd OP-1438 VSI_Arc_PFD+Status : Typo (CruiseCtrl), little cleanup 2014-08-20 13:32:19 +02:00
Laurent Lalanne
8d0f4e71ea OP-1438 VSI_Arc_PFD+Status : Added RcInput panel, work in progress 2014-08-20 02:10:31 +02:00
Laurent Lalanne
2c25d2d875 OP-1438 VSI_Arc_PFD+Status : Added Thrust mode info close to Flightmode 2014-08-19 20:47:21 +02:00
Laurent Lalanne
47aadd25cd OP-1438 VSI_Arc_PFD+Status : Vertical velocity display looks ugly due to telemetry updates, add some filtering. 2014-08-19 16:26:05 +02:00
Laurent Lalanne
5cda39d271 OP-1438 VSI_Arc_PFD+Status : Added FlightTime, ArmStatus, Stab info 2014-08-19 14:16:48 +02:00
Laurent Lalanne
a365c5c6df OP-1438 VSI_Arc_PFD+Status : First commit, modified Vsi with arc, added foreground layer with gradient 2014-08-19 03:14:11 +02:00
Laurent Lalanne
8821754b4a OP-1425 Small_typo_KpKi : Fix typo + french translation / updated translation for error messages 2014-08-05 12:49:35 +02:00
Laurent Lalanne
e7ce7ae4f7 OP-1337 French_translations_updates : Typo 2014-07-27 12:55:22 +02:00
Laurent Lalanne
6d096cad4a OP-1337 French_translations_updates : Calibration help text again 2014-07-27 12:43:03 +02:00
Alessio Morale
19a891c296 Merge remote-tracking branch 'origin/laurent/OP-1354_Current_voltage_fixes_and_more_in_PFD' into rel-14.06 2014-07-14 10:56:40 +02:00
Laurent Lalanne
fc1b49fe01 OP-1354 PFD fixes for telemetry rates display / Telemetry status. Sumdist only displayed if connected via OPLM 2014-07-06 14:53:43 +02:00
Laurent Lalanne
145a69c9f5 OP-1337 Typos fixes in code + Translation update 2014-07-05 18:51:16 +02:00
Alessio Morale
1c4d48b663 Merge remote-tracking branch 'origin/filnet/OP-1376_calibration_results_not_saved_to_SD' into rel-14.06 2014-06-30 23:10:17 +02:00
Alessio Morale
5b4a086193 Merge remote-tracking branch 'origin/laurent/OP-1337_French_translations_updates' into rel-14.06 2014-06-30 23:07:25 +02:00
Laurent Lalanne
26535b2a14 Merge branch 'next' into laurent/OP-1337_French_translations_updates 2014-06-30 22:27:28 +02:00
Laurent Lalanne
dcaa9e19ca OP-1337 Translations fixes 2014-06-28 14:17:32 +02:00
Alessio Morale
0587a2b368 Merge remote-tracking branch 'origin/laurent/OP-1339_System_Health_fixes' into next 2014-06-28 11:36:25 +02:00
Laurent Lalanne
1ed2dbfe29 OP-1337 Little typo error 2014-06-28 11:06:33 +02:00
Alessio Morale
b16f8c54e2 Merge remote-tracking branch 'origin/laurent/OP-1337_French_translations_updates' into next 2014-06-26 19:41:01 +02:00
Laurent Lalanne
75160750fb OP-1337 Translations updates 2014-06-22 22:53:28 +02:00
Laurent Lalanne
8895cae3eb Merge branch 'next' into laurent/OP-1337_French_translations_updates 
Conflicts:
	ground/openpilotgcs/src/plugins/config/calibration/thermal/compensationcalculationtransition.h
 2014-06-22 22:06:35 +02:00
Laurent Lalanne
c6245260ec OP-1354 Removed commented code 2014-06-22 20:37:22 +02:00
Laurent Lalanne
f02f12631d OP-1354 Sumdist reset 2014-06-22 17:06:09 +02:00
Laurent Lalanne
6bdb2fe0b3 OP-1354 Waypoint heading/distance info, basic distance counter. 2014-06-21 21:19:21 +02:00
Laurent Lalanne
7e62aa4161 OP-1354 Added waypoint info : wp# / wp count and mode 2014-06-21 13:09:23 +02:00
Laurent Lalanne
ae0e92b9a0 OP-1354 Compass-waypoint visibility, Home info animation. 2014-06-21 01:31:50 +02:00
Laurent Lalanne
21fcbf024d OP-1354 ETA for home based on current velocity and distance, time conversions/formating 2014-06-20 20:33:43 +02:00
Laurent Lalanne
1921f929f3 OP-1354 Fixed pitch0 line, some centering. Added Home info : distance/bearing to home 2014-06-20 18:26:31 +02:00
Laurent Lalanne
8e2efe0c5f OP-1354 Added compass-home (Enabled if TakeOffLocation.Status is Valid) and compass-waypoint (Currently disabled) 2014-06-20 00:50:44 +02:00
Laurent Lalanne
5dc0cb7d8e OP-1354 Fixes center-arrows position on resize, disable sideslip moving (flicker issue on SmoothedAnimation) 2014-06-19 20:50:47 +02:00
Laurent Lalanne
29d0d31e09 OP-1354 PFD fixes : World size (grey background appears when board is tilted) + Removed empty foreground item (add flickering on render) 2014-06-19 00:49:45 +02:00
Laurent Lalanne
98af0a544f OP-1354 Current_voltage_fixes_and_more_in_PFD : Minor changes to remove some glitches 2014-06-17 19:37:09 +02:00
Laurent Lalanne
529cf301b0 Merge branch 'next' into laurent/OP-1354_Current_voltage_fixes_and_more_in_PFD 2014-06-17 17:17:23 +02:00
Laurent Lalanne
8988e4901b OP-1354 Current_voltage_fixes_and_more_in_PFD : Solid border with round corners, better resizing 2014-06-17 14:29:24 +02:00
Laurent Lalanne
a46a1e09fb OP-1339 System Health fixes : Alignments, text center, text sizes, round corners over layers, red cross. 2014-06-16 22:03:23 +02:00
Alessio Morale
dfdce20044 Merge remote-tracking branch 'origin/Bertrand/OP-1339_System_Health_Improvement' into next 2014-06-16 10:04:55 +02:00
Laurent Lalanne
4ecc78a353 OP-1337 Simplified tooltip message for DelayComp/CC inverted mode 2014-06-11 07:56:16 +02:00
Laurent Lalanne
534a3d2282 OP-1337_French_translations_updates Changes/Updates in uavconfiginfo.cpp (not sure is currently used) 2014-05-28 20:43:38 +02:00
Laurent Lalanne
e3f426d758 OP-1354 Removed pitch0 line from Pitch-scale, fixed RoolScale position (based on radius) + center of rotation. 2014-05-27 22:16:05 +02:00
Laurent Lalanne
08dce43934 OP-1354 Background color (Consumed energy alarm) only displayed with value is > 0 2014-05-27 00:03:52 +02:00
Laurent Lalanne
f8ce7f0624 OP-1354 Added ConsumedEnergy alarm on Pfd : Color changes based on EstimatedFlightTime : 2mn - Orange / 1min Red 2014-05-26 19:57:33 +02:00
Laurent Lalanne
6a9f588082 OP-1354 Updates battery values : Fixes blinking pfd 2014-05-26 16:56:18 +02:00
Laurent Lalanne
9dc02fde61 OP-1354 Current voltage fixes and more in PFD 
Bottom text position (warning alarms)
 2014-05-26 13:55:44 +02:00
Laurent Lalanne
9ec2ef07d6 OP-1354 Current voltage fixes and more in PFD 
Fix Rollscale center of rotation
 2014-05-26 13:54:09 +02:00
Laurent Lalanne
c8f31eb19c OP-1354 Current voltage fixes and more in PFD 
Reverted some previous changes (round fonction) : CPU load
Added mask : Gps bar graph, telemetry
Tested V, A, mAh values.
 2014-05-25 21:29:24 +02:00
Laurent Lalanne
85dd0666f1 OP-1354 Current voltage fixes and more in PFD 
Fix : Gps-text and Altitude scale position
 2014-05-25 16:35:47 +02:00
Laurent Lalanne
893257d08b OP-1354 Current voltage fixes and more in PFD 
Fixes on object position, Warning cross with rounded tips.
 2014-05-25 16:16:42 +02:00
Laurent Lalanne
95e01586db OP-1354 Current voltage fixes and more in PFD 
Fix sizes on svg file
Sideslip working if needed.
 2014-05-25 15:03:53 +02:00
Laurent Lalanne
33bf47bc44 OP-1354 Current voltage fixes and more in PFD 
Better rendering, still problems on top (Gps bars, borders)
 2014-05-25 12:17:37 +02:00
Laurent Lalanne
8bc4b5e7f3 OP-1354 Current voltage fixes and more in PFD 
First commit

Fix Current, Voltage and ConsumedEnergy on Pfd (i hope)
Added Throttle bargraph and Telemetry Tx/Rx + Telemetry status
Top panel with more space for future information / Compass moved
 2014-05-25 05:46:06 +02:00
Laurent Lalanne
3f9507d109 OP-1337 French translations updates 
Minors updates
 2014-05-17 11:49:50 +02:00
Laurent Lalanne
5ea6db1e93 OP-1337 French translations updates 
FlightLog updates
 2014-05-13 17:56:28 +02:00
Laurent Lalanne
7aa221e7ca OP-1337 French translations updates 
Update for help link related to Oplink (source code and translation)
Previously old wiki Pixtreme page
 2014-05-12 19:57:39 +02:00
Laurent Lalanne
06ac0100c7 OP-1337 French translations updates 
Cleanup : Removed obsoletes translations + minor fixes
 2014-05-12 12:07:39 +02:00
Bertrand Oresve
fe9cfa77b4 OP-1339 System Health Improvement 2014-05-11 10:05:47 +02:00
Laurent Lalanne
b30b1ad395 OP-1337 French translations updates 
Dot missing, added in source code and translation updated.
 2014-05-10 13:48:12 +02:00
Laurent Lalanne
0df5266406 OP-1337 French translations updates 
Little changes
 2014-05-10 13:19:56 +02:00
Laurent Lalanne
4f31ce6b01 OP-1337 French translations updates 
Updated wiki links in translation
 2014-05-10 12:21:31 +02:00
Laurent Lalanne
fd8f475b7c OP-1337 French translations updates 
Cruize control tooltips, Firmware Uploader updates
 2014-05-10 01:15:42 +02:00
Laurent Lalanne
77a11a04fc OP-1337 French_translations_updates 
First update
 2014-05-09 21:00:40 +02:00
Bertrand Oresve
5c1435bef1 OP-1161 Add Mag alarm in System-Health 2014-05-01 12:45:34 +02:00
Alessio Morale
000ba5e8f3 Merge remote-tracking branch 'origin/laurent/OP-1172_fonts_in_default_config_files' into next 
Conflicts:
	ground/openpilotgcs/share/openpilotgcs/default_configurations/Developer.xml
	ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
 2014-04-15 22:42:18 +02:00
Andres
7ec855af5f OP-1273 added and implemented Airpeed alarm for the PixHawk sensor 2014-03-28 14:18:14 +01:00
Corvus Corax
12eed41e58 OP-1216 modified alarms for manualcontrol/receiver to reflect new architecture 2014-03-02 20:12:19 +01:00
Alessio Morale
3cf1662bc8 Merge remote-tracking branch 'origin/amorale/OP-1212_telemetry_prio_queue' into next 2014-02-21 19:16:52 +01:00
Alessio Morale
49bc5b8cbd OP-1212 fix GCS plot configurations 2014-02-15 15:32:57 +01:00
Laurent Lalanne
d1252ce261 OP-1187 rel-14.01 Updates 2014-02-09 20:09:37 +01:00
Laurent Lalanne
8795b1aebd Merge remote-tracking branch 'origin/rel-14.01' into laurent/OP-1187_allow_french_translations_in_future_releases 2014-02-09 19:24:15 +01:00
m_thread
9f02d3c170 OP-1191 Added some tooltips and fixed tooltip font color in css to make it work in Fusion style on Linux. 2014-02-09 14:08:07 +01:00
m_thread
da137e18e7 OP-1191 Removed all special tweaks to the macosx css. No need to have this for fusion. 2014-02-08 13:55:32 +01:00
m_thread
0964031ae0 OP-1191 Minor gui fixes. Removed stuff from linux css file. No need to have minor tweaks to the fusion style. 2014-02-08 13:51:42 +01:00
Alessio Morale
4a29db4983 OP-1212 Remove priority task from taskinfo 2014-02-07 18:29:19 +01:00
Laurent Lalanne
f0a1555c14 OP-1187 Indentation 2014-02-03 11:57:33 +01:00
Laurent Lalanne
66fdc73e71 OP-1187 Removed "#" 2014-01-31 19:15:15 +01:00
Laurent Lalanne
8e837fb985 OP-1187 Wrong file copy in lasted commit. 
qt_fr.qm located in tools/Qt_install_dir, allow copy of this file for all systems
 2014-01-29 13:42:39 +01:00
Philippe Renon
40ecef4f94 Merge branch 'OP-1184/cleanup_stack_scope_widget_plot_list' into rel-14.01 2014-01-24 19:58:01 +01:00
Philippe Renon
16ff328bfb OP-1184 removed spurious drawAntialiased setting from stack scope config 
+review OPReview-632
 2014-01-24 19:53:13 +01:00
Philippe Renon
b58620c981 OP-1184 removed obsolete plots from the stack scope monitor gadget 
did same in TaskInfo uav object
 2014-01-24 00:17:47 +01:00
Laurent Lalanne
6e6f5804b5 OP-1172 Remove unused configurations files 2014-01-23 19:15:50 +01:00
Laurent Lalanne
ddde8a9596 OP-1187 Should be the last update before RC release if no changes in Gui/text 2014-01-22 23:34:21 +01:00
Laurent Lalanne
8c06db7c3d OP-1187 Spell check... 2014-01-22 19:59:32 +01:00
Laurent Lalanne
28f96ebd31 OP-1187 Review from Joël (eyesonsky) Thanks ! 2014-01-22 18:08:55 +01:00
Laurent Lalanne
eadb9d69f3 OP-1187 New branch laurent/OP-1187_allow_french_translations_in_future_releases 
Updated lasted text in radio inputs
 2014-01-21 20:52:52 +01:00
Laurent Lalanne
64485f1cf8 Merge remote-tracking branch 'origin/rel-14.01' into laurent/OP-1187_allow_french_translations_in_future_releases 2014-01-21 20:37:18 +01:00
Laurent Lalanne
faaf883a0b Updated Feed Forward tuning page 2014-01-19 14:35:17 +01:00
Laurent Lalanne
2c3d6445b9 Anti-windup / advanced Camera stab updated 2014-01-19 13:34:36 +01:00
Laurent Lalanne
bd66d4b263 Update 2014-01-19 00:06:20 +01:00
Laurent Lalanne
4d6baf47f9 Updates, re-read and some problems inside source code are reported with a flag "Typo" in translator comments. 2014-01-18 17:51:38 +01:00
Laurent Lalanne
4414d11417 OP-1172 Some fonts are not defined in config files 
Fix all font names not defined in default Gcs config files
 2014-01-18 12:30:24 +01:00
Laurent Lalanne
94f29cdb10 Cruize Control text updated 2014-01-18 01:43:45 +01:00
Laurent Lalanne
43703dd6d9 Updates about "Windup" 2014-01-18 00:02:00 +01:00
Laurent Lalanne
a162d885a8 Accentuations missed in capital letters 2014-01-16 23:19:54 +01:00
Laurent Lalanne
e0098b8f54 Updated new strings in Next 2014-01-16 19:59:59 +01:00
Laurent Lalanne
b0614259dc Translations fixes 2014-01-10 23:51:57 +01:00
Laurent Lalanne
e904c9f9cf Horizon line is now displayed fine when board is in inverted flight, center of rotation is located on yellow arrows. 2014-01-10 19:10:28 +01:00
Laurent Lalanne
529f0ade4b Translation progress 2014-01-03 13:52:54 +01:00
Laurent Lalanne
3081b94694 Translation progress 2013-12-28 21:37:33 +01:00
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
Laurent Lalanne
5e62b4bf63 Updates, fix spaces and words on Multirotor wizard 2013-12-18 22:09:36 +01:00
Laurent Lalanne
0929d045dc First translations update after merge from next 2013-12-18 21:18:03 +01:00
Laurent Lalanne
5112d465ad git merge next 2013-12-18 20:14:26 +01:00
Philippe Renon
17c9c8d8b0 Merge remote-tracking branch 'origin/next' into filnet/telemetry 
Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro
 2013-12-07 16:39:19 +01:00
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
Alessio Morale
bac4f96d1c OP-1109: port plugins/pfdqml 2013-11-14 00:48:00 +01:00