Fredrik Arvidsson 538bedeb93 Merge remote-tracking branch 'origin/kevinv033/OP-791' into next ... Conflicts: ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml		2013-04-22 20:14:05 +02:00
..
docs	GCS-Added UAVO to widget framework documentation	2012-07-27 12:14:26 +01:00
openpilotgcs	Merge remote-tracking branch 'origin/kevinv033/OP-791' into next	2013-04-22 20:14:05 +02:00
uavobject-synthetics	build: get rid of build/ground subdirectory, fix qt-creator builds	2013-03-30 17:33:38 +02:00
uavobjgenerator	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00
.gitattributes	OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work)	2013-04-05 23:43:58 +03:00
ground.pro	build: get rid of build/ground subdirectory, fix qt-creator builds	2013-03-30 17:33:38 +02:00