diff options
author | Werner Koch <wk@gnupg.org> | 2011-09-30 12:52:11 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2011-09-30 12:53:34 +0200 |
commit | cdd152bf49026bc1a98336482e3eee30000d59da (patch) | |
tree | 36cf8e6fc7d244974ca548fc7326e953ab55a458 /common/strlist.h | |
parent | Add prefix macro for dotlock functions. (diff) | |
download | gnupg2-cdd152bf49026bc1a98336482e3eee30000d59da.tar.xz gnupg2-cdd152bf49026bc1a98336482e3eee30000d59da.zip |
Change JNLIB license to LGPLv3+ or GPLv2+.
This is to allow the use of this code with code under GPLv2(only).
Diffstat (limited to 'common/strlist.h')
-rw-r--r-- | common/strlist.h | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/common/strlist.h b/common/strlist.h index 3640da63d..c72549fe8 100644 --- a/common/strlist.h +++ b/common/strlist.h @@ -1,20 +1,31 @@ /* strlist.h * Copyright (C) 1998, 2000, 2001, 2006 Free Software Foundation, Inc. * - * This file is part of JNLIB. + * This file is part of JNLIB, which is a subsystem of GnuPG. * * JNLIB is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 3 of - * the License, or (at your option) any later version. + * under the terms of either + * + * - the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at + * your option) any later version. + * + * or + * + * - the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * or both in parallel, as here. * * JNLIB is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copies of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, see <http://www.gnu.org/licenses/>. */ #ifndef LIBJNLIB_STRLIST_H |