RELICENSE: relicense to GPL2/3. All contributors agreed to the relicense. Received separate mail from Martin Pool:

--------------------------------------------
 > You are listed as copyright holder for the files 
 > in kdegraphics/okular/generators/comicbook/qnatsort.cpp. 
 > Please let me know if you approve of such a relicense.
 >
 > I hope you approce.
 
 I'm willing to relicence to GPL2/3.  I'm reluctant to sign a blank
 cheque by agreeing to all future versions of the licence.
 
 -- 
 Martin
--------------------------------------------
CCMAIL: mbp@sourcefrog.net

svn path=/trunk/KDE/kdegraphics/okular/; revision=749279
This commit is contained in:
Tom Albers 2007-12-16 23:34:09 +00:00
parent 18af83bcfc
commit 2bfe44c45c
2 changed files with 22 additions and 28 deletions

View file

@ -2,24 +2,21 @@
Natural order sorting of strings which contains numbers.
Copyright 2007 Tobias Koenig <tokoe@kde.org>
based on the natural order code by Martin Pool <mbp sourcefrog net>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
License version 2 or at your option version 3 as published by
the Free Software Foundation.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
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.
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "qnatsort.h"

View file

@ -2,24 +2,21 @@
Natural order sorting of strings which contains numbers.
Copyright 2007 Tobias Koenig <tokoe@kde.org>
based on the natural order code by Martin Pool <mbp sourcefrog net>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
License version 2 or at your option version 3 as published by
the Free Software Foundation.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
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.
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <QtCore/QString>