Stacey Sheldon 1f1b240b2a Merge remote-tracking branch 'op-public/next' into revo-next ... Conflicts: shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/taskinfo.xml		2012-08-20 21:22:02 -04:00
..
boards	build: use board-specific JTAG interface for openocd	2012-06-21 23:32:04 -04: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	Windows packaging: update sh.cmd script for QtSDK 1.2.1	2012-07-29 23:59:58 +03:00
firmware-defs.mk	makefile: fix clobbered JTAG macro in firmware-defs.mk	2012-08-11 22:28:43 -04:00