diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-20 16:16:40 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-20 16:16:40 +0200 |
| commit | 5729783dbbbaaea835cad2f6621c822c69fe02ea (patch) | |
| tree | d6c8dd7602df48645529ffa2a9a67a58d8686bbf /nxcomp | |
| parent | 03b65211260ff757b35a367f8936fd5e882ce56c (diff) | |
| parent | 7d053959f6ce971d15914dab32de5e145e0f10dc (diff) | |
| download | nx-libs-5729783dbbbaaea835cad2f6621c822c69fe02ea.tar.gz nx-libs-5729783dbbbaaea835cad2f6621c822c69fe02ea.tar.bz2 nx-libs-5729783dbbbaaea835cad2f6621c822c69fe02ea.zip | |
Merge branch 'theqvd-fix-for-112' into 3.6.x
Diffstat (limited to 'nxcomp')
| -rw-r--r-- | nxcomp/Version.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/nxcomp/Version.c b/nxcomp/Version.c index 2b431532b..ff1793434 100644 --- a/nxcomp/Version.c +++ b/nxcomp/Version.c @@ -1,31 +1,22 @@ /**************************************************************************/ /* */ -/* Copyright (C) 2014 Qindel http://qindel.com and QVD http://theqvd.com */ +/* Copyright (c) 2015 Qindel Formacion y Servicios SL. */ /* */ /* 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 Free Software Foundation; either version 3 of the License, or (at */ -/* your option) any later version. */ +/* it under the terms of the GNU General Public License Version 2, as */ +/* published by the Free Software Foundation. */ /* */ /* This program 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 General Public License for more details. */ +/* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA- */ +/* BILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General */ +/* Public License for more details. */ /* */ /* You should have received a copy of the GNU General Public License */ -/* along with this program; if not, see <http://www.gnu.org/licenses>. */ -/* */ -/* Additional permission under GNU GPL version 3 section 7 */ -/* */ -/* If you modify this Program, or any covered work, by linking or */ -/* combining it with [name of library] (or a modified version of that */ -/* library), containing parts covered by the terms of [name of library's */ -/* license], the licensors of this Program grant you additional */ -/* permission to convey the resulting work. {Corresponding Source for a */ -/* non-source form of such a combination shall include the source code */ -/* for the parts of [name of library] used as well as that of the covered */ -/* work.} */ +/* along with this program; if not, you can request a copy from Qindel */ +/* or write to the Free Software Foundation, Inc., 51 Franklin Street, */ +/* Fifth Floor, Boston, MA 02110-1301 USA. */ /* */ +/* All rights reserved. */ /* */ /**************************************************************************/ |