Merge branch 'retro-loiter' of https://code.google.com/r/a432511-wip into auto-approach
Conflicts: Tools/ArdupilotMegaPlanner/Common.cs
Showing
- ArduCopter/ArduCopter.pde 14 additions, 6 deletionsArduCopter/ArduCopter.pde
- ArduCopter/CMakeLists.txt 48 additions, 0 deletionsArduCopter/CMakeLists.txt
- ArduCopter/config.h 10 additions, 0 deletionsArduCopter/config.h
- ArduCopter/navigation.pde 21 additions, 0 deletionsArduCopter/navigation.pde
- ArduCopter/options.cmake 183 additions, 0 deletionsArduCopter/options.cmake
- ArduPlane/APM_Config.h 1 addition, 3 deletionsArduPlane/APM_Config.h
- ArduPlane/CMakeLists.txt 52 additions, 0 deletionsArduPlane/CMakeLists.txt
- ArduPlane/config.h 4 additions, 0 deletionsArduPlane/config.h
- ArduPlane/options.cmake 209 additions, 0 deletionsArduPlane/options.cmake
- CMakeLists.txt 0 additions, 162 deletionsCMakeLists.txt
- README.txt 7 additions, 5 deletionsREADME.txt
- Tools/ArdupilotMegaPlanner/Antenna/Tracker.Designer.cs 292 additions, 383 deletionsTools/ArdupilotMegaPlanner/Antenna/Tracker.Designer.cs
- Tools/ArdupilotMegaPlanner/Antenna/Tracker.resx 829 additions, 119 deletionsTools/ArdupilotMegaPlanner/Antenna/Tracker.resx
- Tools/ArdupilotMegaPlanner/Antenna/Tracker.zh-Hans.resx 208 additions, 0 deletionsTools/ArdupilotMegaPlanner/Antenna/Tracker.zh-Hans.resx
- Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj 9 additions, 0 deletionsTools/ArdupilotMegaPlanner/ArdupilotMega.csproj
- Tools/ArdupilotMegaPlanner/Camera.Designer.cs 383 additions, 383 deletionsTools/ArdupilotMegaPlanner/Camera.Designer.cs
- Tools/ArdupilotMegaPlanner/Camera.resx 943 additions, 943 deletionsTools/ArdupilotMegaPlanner/Camera.resx
- Tools/ArdupilotMegaPlanner/Camera.zh-Hans.resx 208 additions, 0 deletionsTools/ArdupilotMegaPlanner/Camera.zh-Hans.resx
- Tools/ArdupilotMegaPlanner/Common.cs 35 additions, 0 deletionsTools/ArdupilotMegaPlanner/Common.cs
- Tools/ArdupilotMegaPlanner/CurrentState.cs 5 additions, 0 deletionsTools/ArdupilotMegaPlanner/CurrentState.cs
Loading
Please register or sign in to comment