Laura Sebesta c2b49b6ef3 Merge branch 'kenz/cc_hitl_merge' into next ...

Conflicts:
	ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
	ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui

2012-10-08 15:30:27 +02:00

..

bin

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

share

Merge branch 'kenz/cc_hitl_merge' into next

2012-10-08 15:30:27 +02:00

src

Merge branch 'kenz/cc_hitl_merge' into next

2012-10-08 15:30:27 +02:00

copydata.pro

Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible)

2012-07-29 23:59:54 +03:00

openpilotgcs.pri

OP-520 Change $$qtLibraryTarget to $$qtLibraryName

2011-08-04 15:17:08 +02:00

openpilotgcs.pro

OP-483: remove gcs/packaging subdirectory (not required anymore)

2011-05-19 13:08:54 +03:00