diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-15 12:42:28 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-15 12:42:28 +0100 |
| commit | 96db9e81883ab0e3438e8ffdce8e8dce47d204ce (patch) | |
| tree | 2d41d99f2837630219cc56699b27d2a2190374aa /src/examples | |
| parent | e60c1a842c856e1a19fcdc1b169dfdbc813e9ce2 (diff) | |
| parent | e62bd37e73139c77f0d60cd91fe3443ed23df074 (diff) | |
| download | px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.tar.gz px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.tar.bz2 px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.zip | |
Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
src/platforms/px4_middleware.h
Diffstat (limited to 'src/examples')
| -rw-r--r-- | src/examples/fixedwing_control/module.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/examples/fixedwing_control/module.mk b/src/examples/fixedwing_control/module.mk index f6c882ead..da96054d3 100644 --- a/src/examples/fixedwing_control/module.mk +++ b/src/examples/fixedwing_control/module.mk @@ -42,4 +42,4 @@ SRCS = main.c \ MODULE_STACKSIZE = 1200 -EXTRACFLAGS = -Wframe-larger-than=1200 +EXTRACFLAGS = -Wframe-larger-than=1300 |