aboutsummaryrefslogtreecommitdiff
path: root/src/cadet/gnunet-service-cadet.h
diff options
context:
space:
mode:
authorNils Gillmann <ng0@n0.is>2018-06-13 08:05:15 +0000
committerNils Gillmann <ng0@n0.is>2018-06-13 08:05:15 +0000
commit5c7f4f919d2569f49e4223d77000452dd2ec4e97 (patch)
tree8cec76a5dda6b034d1e5b85eee76a43fafd8a4a5 /src/cadet/gnunet-service-cadet.h
parent1f7a2dd68d1e6260fad4af042878c0a07d39bc12 (diff)
parent8503c6fa26449228fa691c1dedfe3ca1a8d0b9ba (diff)
downloadgnunet-5c7f4f919d2569f49e4223d77000452dd2ec4e97.tar.gz
gnunet-5c7f4f919d2569f49e4223d77000452dd2ec4e97.zip
Merge branch 'master' of gnunet.org:gnunet
Signed-off-by: Nils Gillmann <ng0@n0.is>
Diffstat (limited to 'src/cadet/gnunet-service-cadet.h')
-rw-r--r--src/cadet/gnunet-service-cadet.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/cadet/gnunet-service-cadet.h b/src/cadet/gnunet-service-cadet.h
index 162867823..5587755d1 100644
--- a/src/cadet/gnunet-service-cadet.h
+++ b/src/cadet/gnunet-service-cadet.h
@@ -3,20 +3,18 @@
3 This file is part of GNUnet. 3 This file is part of GNUnet.
4 Copyright (C) 2001-2017 GNUnet e.V. 4 Copyright (C) 2001-2017 GNUnet e.V.
5 5
6 GNUnet is free software; you can redistribute it and/or modify 6 GNUnet is free software: you can redistribute it and/or modify it
7 it under the terms of the GNU General Public License as published 7 under the terms of the GNU Affero General Public License as published
8 by the Free Software Foundation; either version 3, or (at your 8 by the Free Software Foundation, either version 3 of the License,
9 option) any later version. 9 or (at your option) any later version.
10 10
11 GNUnet is distributed in the hope that it will be useful, but 11 GNUnet is distributed in the hope that it will be useful, but
12 WITHOUT ANY WARRANTY; without even the implied warranty of 12 WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 General Public License for more details. 14 Affero General Public License for more details.
15 15
16 You should have received a copy of the GNU General Public License 16 You should have received a copy of the GNU Affero General Public License
17 along with GNUnet; see the file COPYING. If not, write to the 17 along with this program. If not, see <http://www.gnu.org/licenses/>.
18 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 Boston, MA 02110-1301, USA.
20*/ 18*/
21 19
22/** 20/**