aboutsummaryrefslogtreecommitdiff
path: root/apps/uORB
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2012-11-10 15:22:42 +0100
committerThomas Gubler <thomasgubler@gmail.com>2012-11-10 15:22:42 +0100
commit536ab4bce3f68f443ef9d1ab16c7e49011af656a (patch)
tree44cc43f9cac229fe9044d51a1ddd6ef6e996f411 /apps/uORB
parent8768b7ddbf0a2e420555072d21ce3ec95e373c01 (diff)
parent90466afe05359cd5fc1d5b44b13d73912fb6571b (diff)
downloadpx4-firmware-536ab4bce3f68f443ef9d1ab16c7e49011af656a.tar.gz
px4-firmware-536ab4bce3f68f443ef9d1ab16c7e49011af656a.tar.bz2
px4-firmware-536ab4bce3f68f443ef9d1ab16c7e49011af656a.zip
Merge branch 'master' of https://github.com/PX4/Firmware into fw_control
Diffstat (limited to 'apps/uORB')
-rw-r--r--apps/uORB/topics/subsystem_info.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/uORB/topics/subsystem_info.h b/apps/uORB/topics/subsystem_info.h
index 89b397478..c3e039d66 100644
--- a/apps/uORB/topics/subsystem_info.h
+++ b/apps/uORB/topics/subsystem_info.h
@@ -1,9 +1,9 @@
/****************************************************************************
*
- * Copyright (C) 2008-2012 PX4 Development Team. All rights reserved.
- * Author: @author Lorenz Meier <lm@inf.ethz.ch>
- * @author Thomas Gubler <thomasgubler@student.ethz.ch>
- * @author Julian Oes <joes@student.ethz.ch>
+ * Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ * Author: Lorenz Meier <lm@inf.ethz.ch>
+ * Thomas Gubler <thomasgubler@student.ethz.ch>
+ * Julian Oes <joes@student.ethz.ch>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,6 +37,10 @@
/**
* @file subsystem_info.h
* Definition of the subsystem info topic.
+ *
+ * @author Lorenz Meier <lm@inf.ethz.ch>
+ * @author Thomas Gubler <thomasgubler@student.ethz.ch>
+ * @author Julian Oes <joes@student.ethz.ch>
*/
#ifndef TOPIC_SUBSYSTEM_INFO_H_