Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

firmware build

This commit is contained in:
Michael Oborne 2011-09-13 02:47:04 +08:00
parent 01559f4c22
commit 8129c8e5c5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/ArdupilotMegaPlanner/Firmware/git.log
View File

@ -1,6 +1,6 @@
From https://code.google.com/p/ardupilot-mega From https://code.google.com/p/ardupilot-mega
a543a5c..fe617ae master -> origin/master 28bb6fd..c5f0dc1 APM_Camera -> origin/APM_Camera
Updating a543a5c..fe617ae 8905f63..112b274 master -> origin/master
Fast-forward error: Your local changes to 'ArduPlane/APM_Config.h' would be overwritten by merge. Aborting.
ArduCopter/config.h | 2 +- Please, commit your changes or stash them before you can merge.
1 files changed, 1 insertions(+), 1 deletions(-) Updating 8905f63..112b274