diff options
| author | Julian Oes <julian@oes.ch> | 2013-07-08 10:31:32 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-07-08 10:31:32 +0200 |
| commit | 88389ea2554c6f56a4fdd86cdd86a1e7b6affc21 (patch) | |
| tree | 3ef98ded43e5f3a2cdc30a836a3a7329fe5757bb /nuttx/.gitignore | |
| parent | 76346bfe19c816491a6982abfa10f48cd9d258f6 (diff) | |
| parent | cf2dbdf9a1ae06c7d0e0a7963916a3709a1bc075 (diff) | |
| download | px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.tar.gz px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.tar.bz2 px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.zip | |
Merge branch 'master' into new_state_machine
compiling again
Conflicts:
src/modules/fixedwing_att_control/fixedwing_att_control_att.c
src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
src/modules/mavlink/orb_listener.c
src/modules/multirotor_att_control/multirotor_attitude_control.c
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/systemlib/pid/pid.c
src/modules/systemlib/pid/pid.h
src/modules/uORB/objects_common.cpp
Diffstat (limited to 'nuttx/.gitignore')
| -rw-r--r-- | nuttx/.gitignore | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/nuttx/.gitignore b/nuttx/.gitignore deleted file mode 100644 index 0d763ab2a..000000000 --- a/nuttx/.gitignore +++ /dev/null @@ -1,28 +0,0 @@ -*.a -.config -.config-e -.configX-e -.depend -.version -arch/arm/include/board -arch/arm/include/chip -arch/arm/src/board -arch/arm/src/chip -include/apps -include/arch -include/math.h -include/nuttx/config.h -include/nuttx/version.h -Make.defs -Make.dep -mkdeps -nuttx -nuttx-export.zip -nuttx.bin -nuttx.hex -setenv.sh -System.map -tools/mkconfig -tools/mkconfig.exe -tools/mkversion -tools/mkversion.exe |