diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2014-05-15 14:35:49 +0200 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2014-05-15 14:35:49 +0200 |
commit | 8d1df9ba87ee152ca35ddbfa94924b868db62d64 (patch) | |
tree | 4a4ccee6ebd53af79986d613e9df0841e1f959f6 /src/modules/navigator/geofence.h | |
parent | bc3ca8db5646cf2a2e235cf7ca3bd62335e062c2 (diff) | |
parent | c72ec3fd5fc934e0aae08d605058c36858d9fd3e (diff) | |
download | px4-firmware-8d1df9ba87ee152ca35ddbfa94924b868db62d64.tar.gz px4-firmware-8d1df9ba87ee152ca35ddbfa94924b868db62d64.tar.bz2 px4-firmware-8d1df9ba87ee152ca35ddbfa94924b868db62d64.zip |
Merge branch 'master' into mc_mixer_fix
Diffstat (limited to 'src/modules/navigator/geofence.h')
-rw-r--r-- | src/modules/navigator/geofence.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/navigator/geofence.h b/src/modules/navigator/geofence.h index 9628b7271..2eb126ab5 100644 --- a/src/modules/navigator/geofence.h +++ b/src/modules/navigator/geofence.h @@ -1,8 +1,6 @@ /**************************************************************************** * * Copyright (c) 2013 PX4 Development Team. All rights reserved. - * Author: @author Jean Cyr <jean.m.cyr@gmail.com> - * @author Thomas Gubler <thomasgubler@gmail.com> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -35,6 +33,9 @@ /** * @file geofence.h * Provides functions for handling the geofence + * + * @author Jean Cyr <jean.m.cyr@gmail.com> + * @author Thomas Gubler <thomasgubler@gmail.com> */ #ifndef GEOFENCE_H_ |