Corvus Corax 298b6233ed Merge branch 'revo-next' into corvuscorax/new_navigation ... Conflicts: flight/Libraries/paths.c flight/Modules/ManualControl/manualcontrol.c flight/Revolution/Makefile shared/uavobjectdefinition/taskinfo.xml		2012-05-30 00:51:52 +02:00
..
System	Merge remote-tracking branch 'revo/revo-next' into testing	2012-05-28 09:13:26 -05:00
Makefile	Merge branch 'revo-next' into corvuscorax/new_navigation	2012-05-30 00:51:52 +02:00
Makefile.osx	Reduce the CPU usage of OSX simuluator	2012-05-08 02:29:58 -05:00
UAVObjects.inc	Merge remote-tracking branch 'revo/revo-next' into testing	2012-05-28 09:13:26 -05:00