Sambas 742f3ff24d Merge remote-tracking branch 'remotes/origin/james/revolution' into osd_test ... Conflicts: ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp		2012-03-11 09:39:51 +02:00
..
openpilotgcs	Merge remote-tracking branch 'remotes/origin/james/revolution' into osd_test	2012-03-11 09:39:51 +02:00
uavobjects	Fix 64-Bit Linux build problem in QT-Creator	2011-04-03 16:25:21 +00:00
uavobjgenerator	Merge branch 'next' into revolution	2012-03-03 11:41:41 -06:00
ground.pro	Change reference to svn by git (in comments, no code change)	2011-04-24 20:23:20 +03:00