Corvus Corax c63540b2ec Merge branch 'corvuscorax/OP-1309_Stabilization-Refactoring' into corvuscorax/OP-1259_Cruise_Control_Tweaks ...

Conflicts:
	flight/modules/Stabilization/stabilization.c
	shared/uavobjectdefinition/stabilizationsettings.xml

2014-05-02 18:25:57 +02:00

..

bin

OP-719: fix +x for openpilotgcs on linux

2013-04-14 14:09:46 +03:00

share

Merge remote-tracking branch 'origin/laurent/OP-1172_fonts_in_default_config_files' into next

2014-04-15 22:42:18 +02:00

src

Merge branch 'corvuscorax/OP-1309_Stabilization-Refactoring' into corvuscorax/OP-1259_Cruise_Control_Tweaks

2014-05-02 18:25:57 +02:00

copydata.pro

Merge remote-tracking branch 'origin/next' into shared/OP-1252_update_to_qt521

2014-04-08 11:31:23 +02:00

openpilotgcs.pri

Merge remote-tracking branch 'origin/fnurgel/OP-1162_linux_deb_packaging_qt5' into next

2014-01-18 14:18:46 +01:00

openpilotgcs.pro

OP-1155 OSX Package: Set QMAKE_MACOSX_DEPLOYMENT_TARGET

2014-01-10 00:44:12 +01:00