Merged in APM config tree

2ba6578d · Lorenz Meier · 27274cd8 · d88d49f6 · 2ba6578d · 2ba6578d
Commit 2ba6578d authored Aug 02, 2013 by Lorenz Meier
--- a/.gitignore
+++ b/.gitignore
@@ -49,7 +49,8 @@ user_config.pri
 *.suo
 *.uhf.txt
 *.opensdf
-
 thirdParty/qserialport-build-desktop/
 thirdParty/qserialport/bin/
 thirdParty/qserialport/lib/
+apmplanner2.xcodeproj/
+GeneratedFiles/
--- a/avrdude/avrdude.conf
+++ b/avrdude/avrdude.conf
--- a/avrdude/avrdude.exe
+++ b/avrdude/avrdude.exe
--- a/avrdude/libusb0.dll
+++ b/avrdude/libusb0.dll
--- a/files/images/firmware/FW icons 2013+logos.ai
+++ b/files/images/firmware/FW icons 2013+logos.ai
--- a/files/images/firmware/Tir_off.png
+++ b/files/images/firmware/Tir_off.png
--- a/files/images/firmware/Tir_on.png
+++ b/files/images/firmware/Tir_on.png
--- a/files/images/firmware/X8.png
+++ b/files/images/firmware/X8.png
--- a/files/images/firmware/X8_on.png
+++ b/files/images/firmware/X8_on.png
--- a/files/images/firmware/Y6_off.png
+++ b/files/images/firmware/Y6_off.png
--- a/files/images/firmware/Y6_on.png
+++ b/files/images/firmware/Y6_on.png
--- a/files/images/firmware/apmcopter.png
+++ b/files/images/firmware/apmcopter.png
--- a/files/images/firmware/apmplane.png
+++ b/files/images/firmware/apmplane.png
--- a/files/images/firmware/apmrover.png
+++ b/files/images/firmware/apmrover.png
--- a/files/images/firmware/heli.png
+++ b/files/images/firmware/heli.png
--- a/files/images/firmware/heli_off.png
+++ b/files/images/firmware/heli_off.png
--- a/files/images/firmware/heli_on.png
+++ b/files/images/firmware/heli_on.png
--- a/files/images/firmware/hexa_off.png
+++ b/files/images/firmware/hexa_off.png
--- a/files/images/firmware/hexa_on.png
+++ b/files/images/firmware/hexa_on.png
--- a/files/images/firmware/hexaplus.png
+++ b/files/images/firmware/hexaplus.png