diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:58:55 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:58:55 +0200 |
| commit | 01a54390e9ac1daa3af8c51ae3c35e39bf99cec6 (patch) | |
| tree | 5bdb086ac86053baa69e9bb97f0472727d3e1e6d /src/lib/launchdetection/LaunchDetector.cpp | |
| parent | d1bd4b0a45ec0f6f081560fbadf675e21ce53d83 (diff) | |
| parent | 3f4c264050774e79add989cb85a80623038478c0 (diff) | |
| download | px4-firmware-01a54390e9ac1daa3af8c51ae3c35e39bf99cec6.tar.gz px4-firmware-01a54390e9ac1daa3af8c51ae3c35e39bf99cec6.tar.bz2 px4-firmware-01a54390e9ac1daa3af8c51ae3c35e39bf99cec6.zip | |
Merge remote-tracking branch 'upstream/master' into qu4d
Diffstat (limited to 'src/lib/launchdetection/LaunchDetector.cpp')
| -rw-r--r-- | src/lib/launchdetection/LaunchDetector.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/launchdetection/LaunchDetector.cpp b/src/lib/launchdetection/LaunchDetector.cpp index bf539701b..3bf47bbb0 100644 --- a/src/lib/launchdetection/LaunchDetector.cpp +++ b/src/lib/launchdetection/LaunchDetector.cpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2013 Estimation and Control Library (ECL). All rights reserved. + * Copyright (c) 2013, 2014 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name ECL nor the names of its contributors may be + * 3. Neither the name PX4 nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * @@ -30,12 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ - /** * @file launchDetection.cpp * Auto Detection for different launch methods (e.g. catapult) * - * Authors and acknowledgements in header. + * @author Thomas Gubler <thomasgubler@gmail.com> */ #include "LaunchDetector.h" |