diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-22 13:25:52 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-22 13:25:52 +0200 |
| commit | 05648d80d25febd220bac503aad3756d6dc5401b (patch) | |
| tree | 0442a564409a6aeecea80d07bdc1802f48b9fc63 /src/modules/navigator/geofence.h | |
| parent | a6a2efb651d875171aaec698a836f26b548ca0d6 (diff) | |
| parent | 9ea0b2189992830f2698c7d4703ff472072a61b1 (diff) | |
| download | px4-firmware-05648d80d25febd220bac503aad3756d6dc5401b.tar.gz px4-firmware-05648d80d25febd220bac503aad3756d6dc5401b.tar.bz2 px4-firmware-05648d80d25febd220bac503aad3756d6dc5401b.zip | |
Merge remote-tracking branch 'upstream/master' into geo
Conflicts:
src/modules/commander/commander.cpp
src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
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_ |