From https://code.google.com/p/ardupilot-mega
   6a8104d..b4f49d1  APM_Camera -> origin/APM_Camera
   d5ab678..7f6c49b  master     -> origin/master
Updating d5ab678..7f6c49b
Fast-forward
 ArduCopter/APM_Config.h            |   19 ++++++
 ArduCopter/ArduCopter.pde          |   48 +++++++++++++--
 ArduCopter/Camera.pde              |   11 ++-
 ArduCopter/Parameters.h            |   15 ++++-
 ArduCopter/UserCode.pde            |   15 +++++
 ArduCopter/UserVariables.h         |   13 ++++
 ArduCopter/config.h                |   14 ++++-
 ArduCopter/control_modes.pde       |   19 ++++---
 ArduCopter/heli.pde                |   49 ++++++++++------
 ArduCopter/navigation.pde          |   26 ++++++--
 ArduCopter/radio.pde               |    8 ---
 ArduCopter/read_commands.pde       |  112 ------------------------------------
 ArduCopter/setup.pde               |    6 +-
 ArduCopter/system.pde              |   11 +---
 ArduCopter/test.pde                |    2 +-
 libraries/Desktop/Desktop.mk       |   18 +++---
 libraries/Desktop/Makefile.desktop |    5 +-
 17 files changed, 198 insertions(+), 193 deletions(-)
 create mode 100644 ArduCopter/UserCode.pde
 create mode 100644 ArduCopter/UserVariables.h
 delete mode 100644 ArduCopter/read_commands.pde