diff options
author | Phil <phil.buschmann@tum.de> | 2018-06-11 22:10:32 +0200 |
---|---|---|
committer | Phil <phil.buschmann@tum.de> | 2018-06-11 22:10:32 +0200 |
commit | 09b6a814e0ddcca0497c5cbf37940c27e6a5d9de (patch) | |
tree | f9884590450463aa95d9f858e9992e103467e89e /src/psyc/psyc.h | |
parent | c1062075eddca49cfeaac8f7fd8c84e73198c2aa (diff) | |
parent | bb581dc55bfb90fc7f34797111b55d16e69b7af0 (diff) | |
download | gnunet-09b6a814e0ddcca0497c5cbf37940c27e6a5d9de.tar.gz gnunet-09b6a814e0ddcca0497c5cbf37940c27e6a5d9de.zip |
-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
Diffstat (limited to 'src/psyc/psyc.h')
-rw-r--r-- | src/psyc/psyc.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/psyc/psyc.h b/src/psyc/psyc.h index c1ce466a9..1296cc67f 100644 --- a/src/psyc/psyc.h +++ b/src/psyc/psyc.h | |||
@@ -2,20 +2,18 @@ | |||
2 | * This file is part of GNUnet | 2 | * This file is part of GNUnet |
3 | * Copyright (C) 2013 GNUnet e.V. | 3 | * Copyright (C) 2013 GNUnet e.V. |
4 | * | 4 | * |
5 | * GNUnet is free software; you can redistribute it and/or modify | 5 | * GNUnet is free software: you can redistribute it and/or modify it |
6 | * it under the terms of the GNU General Public License as published | 6 | * under the terms of the GNU Affero General Public License as published |
7 | * by the Free Software Foundation; either version 3, or (at your | 7 | * by the Free Software Foundation, either version 3 of the License, |
8 | * option) any later version. | 8 | * or (at your option) any later version. |
9 | * | 9 | * |
10 | * GNUnet is distributed in the hope that it will be useful, but | 10 | * GNUnet is distributed in the hope that it will be useful, but |
11 | * WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | * WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | * General Public License for more details. | 13 | * Affero General Public License for more details. |
14 | * | 14 | * |
15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU Affero General Public License |
16 | * along with GNUnet; see the file COPYING. If not, write to the | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
18 | * Boston, MA 02110-1301, USA. | ||
19 | */ | 17 | */ |
20 | 18 | ||
21 | /** | 19 | /** |