diff options
Diffstat (limited to 'src/libfreeswan/copyright.c')
| -rw-r--r-- | src/libfreeswan/copyright.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/libfreeswan/copyright.c b/src/libfreeswan/copyright.c index 65585b62e..ff4575add 100644 --- a/src/libfreeswan/copyright.c +++ b/src/libfreeswan/copyright.c @@ -27,6 +27,7 @@ static const char *co[] = { " Christoph Gysin, Andreas Hess, Patric Lichtsteiner, Michael Meier,", " Andreas Schleiss, Ariane Seiler, Mario Strasser, Lukas Suter,", " Roger Wegmann, Simon Zwahlen,", +<<<<<<< HEAD " Zuercher Hochschule Winterthur (Switzerland).", "", " Philip Boetschi, Tobias Brunner, Adrian Doerig, Andreas Eigenmann,", @@ -34,6 +35,15 @@ static const char *co[] = { " Daniel Roethlisberger, Joel Stillhart, Martin Willi, Daniel Wydler,", " Andreas Steffen,", " Hochschule fuer Technik Rapperswil (Switzerland).", +======= + " ZHW Zuercher Hochschule Winterthur (Switzerland).", + "", + " Philip Boetschi, Tobias Brunner, Sansar Choinyambuu, Adrian Doerig,", + " Andreas Eigenmann, Fabian Hartmann, Noah Heusser, Jan Hutter,", + " Thomas Kallenberg, Daniel Roethlisberger, Joel Stillhart, Martin Willi,", + " Daniel Wydler, Andreas Steffen,", + " HSR Hochschule fuer Technik Rapperswil (Switzerland).", +>>>>>>> upstream/4.5.1 "", "This program is free software; you can redistribute it and/or modify it", "under the terms of the GNU General Public License as published by the", |