James Cotton 5fd458426a Merge branch 'cc3d' into revolution3 ... Conflicts: flight/PiOS/inc/pios_l3gd20.h flight/PiOS/pios.h flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj		2012-01-23 22:09:45 -06:00
..
boards	Merge branch 'cc3d' into revolution3	2012-01-23 22:09:45 -06:00
scripts	build: change FWTAG replacement to keep suffix intact and trim branch/tag only	2011-05-26 09:01:44 -04:00
templates	gcs: add git version info to the About dialog using version-info.py	2011-05-29 00:27:07 +03:00
winx86	package: (win) add comment regarding newer Qt SDK location and SDL requirements	2011-05-28 11:46:51 +03:00
firmware-defs.mk	jtag: add new make targets for reset and safeboot	2012-01-02 14:27:07 -05:00