Brian Webb 3fabdb9963 Fixed conflicted merge with origin/next.		2012-07-11 19:25:05 -07:00
..
openpilotgcs	Fixed conflicted merge with origin/next.	2012-07-11 19:25:05 -07:00
uavobjects	GCS - Strangely QtCreator builds stopped working for me after compiling Wireshark on Ubuntu.	2012-07-09 14:52:41 +01:00
uavobjgenerator	Merge branch 'next' into thread/OP-642	2012-07-01 12:25:23 +02:00
ground.pro	Change reference to svn by git (in comments, no code change)	2011-04-24 20:23:20 +03:00