Commit Graph

3 Commits

Author SHA1 Message Date
Olivier ADLER 7e3983210c Merge branch 'APM_Camera' of https://code.google.com/p/ardupilot-mega/
Conflicts:
	ArduPlane/ArduPlane.pde
	libraries/AP_Camera/AP_Camera.h
	libraries/AP_Mount/AP_Mount.cpp
	libraries/AP_Mount/AP_Mount.h
2011-09-12 00:31:18 +02:00
Olivier ADLER 6dfa53bcb1 Signed-off-by: Olivier ADLER <contact2@nerim.net>
slightly upped motor out values for motor test. Was too low for some ESCs.
2011-09-11 23:32:04 +02:00
Andrew Tridgell be8864f424 renamed top level directories
ArduCopterMega -> ArduCopter
added archives directory for old code
2011-09-09 11:27:41 +10:00