Mark Charlebois 3a65187303 Fixed bad merge ...

Forgot to remove old file line when merging the changes from master.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

2015-05-06 16:00:00 -07:00

..

attitude_estimator_ekf

Merge remote-tracking branch 'upstream/master' into linux

2015-05-06 15:51:39 -07:00

attitude_estimator_q

attitude_estimator_q: Max gyro bias limiting, auto declination

2015-04-13 19:32:23 +02:00

attitude_estimator_so3

Fixed overzealous px4_ prefixing

2015-05-06 15:32:04 -07:00

bottle_drop

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

commander

Fixed bad merge

2015-05-06 16:00:00 -07:00

controllib

trivial code style cleanup round 2

2015-03-27 23:38:58 -04:00

dataman

Added px4_ prefix to task_spawn_cmd

2015-05-06 14:20:08 -07:00

ekf_att_pos_estimator

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

fixedwing_backside

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

fw_att_control

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

fw_pos_control_l1

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

gpio_led

trivial code style cleanup round 2

2015-03-27 23:38:58 -04:00

land_detector

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

mavlink

Merge remote-tracking branch 'upstream/master' into linux

2015-05-06 15:51:39 -07:00

mc_att_control

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

mc_att_control_multiplatform

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

mc_pos_control

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

mc_pos_control_multiplatform

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

navigator

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

position_estimator_inav

Merge remote-tracking branch 'upstream/master' into linux

2015-05-06 15:51:39 -07:00

px4iofirmware

Merge remote-tracking branch 'upstream/master' into linux

2015-05-06 15:51:39 -07:00

sdlog2

Added px4_ prefix to task_spawn_cmd

2015-05-06 14:20:08 -07:00

segway

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

sensors

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

simulator

GCC fixes for warnings

2015-05-06 11:45:23 -07:00

systemlib

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

uavcan

Removed extra abstracton layer in systemlib

2015-05-06 14:43:11 -07:00

unit_test

trivial code style cleanup round 2

2015-03-27 23:38:58 -04:00

uORB

uORB: Unit test fix

2015-05-06 13:19:52 -07:00

vtol_att_control

Merge remote-tracking branch 'upstream/master' into linux

2015-05-06 15:51:39 -07:00