diff options
| author | Christian Pointner <equinox@anytun.org> | 2014-06-29 01:09:50 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2014-06-29 01:09:50 +0000 |
| commit | af411283fa6f27ee19547882bf403ff34cb73d5e (patch) | |
| tree | 61f09caf09e7c92ad82e697a788c3411633f2526 /src/syncQueue.cpp | |
| parent | fixed not working singletons - still not threadsafe but at least they don't p... (diff) | |
added license exception for OpenSSL
Diffstat (limited to 'src/syncQueue.cpp')
| -rw-r--r-- | src/syncQueue.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/syncQueue.cpp b/src/syncQueue.cpp index 338637c..f799532 100644 --- a/src/syncQueue.cpp +++ b/src/syncQueue.cpp @@ -11,7 +11,7 @@ * tunneling and relaying of packets of any protocol. * * - * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, + * Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl, * Christian Pointner <satp@wirdorange.org> * * This file is part of Anytun. @@ -27,7 +27,20 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with anytun. If not, see <http://www.gnu.org/licenses/>. + * along with Anytun. If not, see <http://www.gnu.org/licenses/>. + * + * In addition, as a special exception, the copyright holders give + * permission to link the code of portions of this program with the + * OpenSSL library under certain conditions as described in each + * individual source file, and distribute linked combinations + * including the two. + * You must obey the GNU General Public License in all respects + * for all of the code used other than OpenSSL. If you modify + * file(s) with this exception, you may extend this exception to your + * version of the file(s), but you are not obligated to do so. If you + * do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source + * files in the program, then also delete it here. */ #include "threadUtils.hpp" |