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
..
inc	Fix win32 sim macro problem	2011-09-01 21:50:13 -04:00
win32	Merge remote-tracking branch 'op-public/next' into revo-next	2012-08-20 21:22:02 -04:00
pios.h	Fix win32 SiTL by adding PiOS CRC and another missing function.	2011-06-20 15:48:05 -04:00