Corvus Corax 922b3b7f1e Merge branch 'basenext' into corvuscorax/new_navigation ...

Conflicts:
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro

2012-05-27 01:41:51 +02:00

..

openpilotgcs

Merge branch 'basenext' into corvuscorax/new_navigation

2012-05-27 01:41:51 +02:00

uavobjects

Fix 64-Bit Linux build problem in QT-Creator

2011-04-03 16:25:21 +00:00

uavobjgenerator

Merged latest origin/next.

2012-05-05 09:40:44 -07:00

ground.pro

Change reference to svn by git (in comments, no code change)

2011-04-24 20:23:20 +03:00