diff --git a/Tools/ArdupilotMegaPlanner/Firmware/git.log b/Tools/ArdupilotMegaPlanner/Firmware/git.log index c1c5499cfe..2a7bfed917 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/git.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/git.log @@ -1,35 +1 @@ -From https://code.google.com/p/ardupilot-mega - 61a4415..c9f4213 APM_Camera -> origin/APM_Camera - ef1372b..5f4c529 master -> origin/master -Updating ef1372b..5f4c529 -Fast-forward - ArduCopter/ArduCopter.pde | 17 +- - ArduCopter/GCS_Standard.pde | 2 +- - ArduCopter/Log.pde | 5 +- - ArduCopter/Parameters.h | 49 +- - ArduCopter/flip.pde | 9 +- - ArduCopter/heli.pde | 118 +- - ArduCopter/setup.pde | 34 +- - ArduCopter/system.pde | 8 - - ArduPlane/radio.pde | 2 +- - Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj | 4 + - .../GCSViews/Configuration.Designer.cs | 328 +- - .../GCSViews/Configuration.resx | 27 +- - Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs | 1 - - .../GCSViews/FlightPlanner.Designer.cs | 103 +- - .../GCSViews/FlightPlanner.resx | 47 +- - Tools/ArdupilotMegaPlanner/Log.cs | 15 + - Tools/ArdupilotMegaPlanner/MAVLink.cs | 3 + - Tools/ArdupilotMegaPlanner/MAVLinkTypes.cs | 2 - - Tools/ArdupilotMegaPlanner/MainV2.cs | 135 +- - .../Properties/AssemblyInfo.cs | 2 +- - Tools/ArdupilotMegaPlanner/Setup/Setup.cs | 40 +- - .../bin/Release/ArdupilotMegaPlanner.exe | Bin 2098176 -> 2112512 bytes - .../bin/Release/GCSViews/Configuration.resx | 8124 +++++++++++--------- - .../bin/Release/GCSViews/FlightPlanner.resx | 2725 ++++---- - Tools/ArdupilotMegaPlanner/bin/Release/Updater.exe | Bin 8192 -> 8192 bytes - .../bin/Release/dataflashlog.xml | 18 +- - Tools/ArdupilotMegaPlanner/bin/Release/resedit.exe | Bin 13312 -> 13312 bytes - .../zh-Hans/ArdupilotMegaPlanner.resources.dll | Bin 397312 -> 380928 bytes - Tools/ArdupilotMegaPlanner/dataflashlog.xml | 18 +- - 29 files changed, 6234 insertions(+), 5602 deletions(-) +Already up-to-date.