diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-04-26 22:01:18 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-04-26 22:01:18 +0200 |
| commit | 811dd12ac56396d752def4070288fc74a7dd1abb (patch) | |
| tree | bcf22c437a0592a52c2ce1cdd6117c70385f0ce4 /src/lib/launchdetection/CatapultLaunchMethod.h | |
| parent | cfe346ddfafbc1d2e04f510fbee8b6fc3b1aedb3 (diff) | |
| parent | 4a949a9565b08bac24130b36bd677d9d08b7cdc8 (diff) | |
| download | px4-firmware-811dd12ac56396d752def4070288fc74a7dd1abb.tar.gz px4-firmware-811dd12ac56396d752def4070288fc74a7dd1abb.tar.bz2 px4-firmware-811dd12ac56396d752def4070288fc74a7dd1abb.zip | |
Merge remote-tracking branch 'upstream/master' into mtecs
Diffstat (limited to 'src/lib/launchdetection/CatapultLaunchMethod.h')
| -rw-r--r-- | src/lib/launchdetection/CatapultLaunchMethod.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/launchdetection/CatapultLaunchMethod.h b/src/lib/launchdetection/CatapultLaunchMethod.h index 55c46ff3f..23757f6f3 100644 --- a/src/lib/launchdetection/CatapultLaunchMethod.h +++ b/src/lib/launchdetection/CatapultLaunchMethod.h @@ -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 @@ -10,9 +10,9 @@ * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in - * the documentation4 and/or other materials provided with the + * 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. * |