From dc0de8caf20270013b7f168502afdc3abd9aec25 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sun, 25 Dec 2011 20:58:19 +0100 Subject: [PATCH] Update copyright information. --- COPYING | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/COPYING b/COPYING index a86ddcb38..8ad3bdd86 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ KeePassX - http://www.keepassx.org/ -Copyright (C) 2010 Felix Geyer +Copyright (C) 2010-2011 Felix Geyer 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 @@ -18,14 +18,9 @@ Name: KeePassX Maintainer: Felix Geyer Source: http://www.keepassx.org/ -Copyright: 2010, Felix Geyer +Copyright: 2010-2011, Felix Geyer License: GPL-2 or GPL-3 -Files: cmake/FindLibgcrypt.cmake -Copyright: 2006, Pino Toscano - 2008, Modestas Vainius -License: BSD - Files: share/icons/entries/*.png Copyright: 2003-2004, David Vignoni License: LGPL-2.1 @@ -34,10 +29,6 @@ Files: src/crypto/salsa20/* Copyright: is in public domain License: - -Files: src/streams/qtiocompressor.*, src/streams/QtIOCompressor -Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies) +Files: src/streams/qtiocompressor.*, src/streams/QtIOCompressor, tests/modeltest.* +Copyright: 2009-2011, Nokia Corporation and/or its subsidiary(-ies) License: LGPL-2.1 or GPL-3 - -Files: tests/modeltest.* -Copyright: 2007, Trolltech ASA -License: GPL-2