From 266f1a2afa890a7e2750a51fa3d6da98240751fe Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Fri, 14 Nov 2014 12:20:59 +0100 Subject: harmonize copyright notice --- apps/files_encryption/hooks/hooks.php | 6 ++++-- apps/files_encryption/lib/helper.php | 6 ++++-- apps/files_encryption/lib/keymanager.php | 5 +++-- apps/files_encryption/lib/migration.php | 5 +++-- apps/files_encryption/lib/proxy.php | 9 +++++---- apps/files_encryption/lib/session.php | 6 ++++-- apps/files_encryption/lib/util.php | 9 +++++---- 7 files changed, 28 insertions(+), 18 deletions(-) diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 4867ca3e481..1413a0580a1 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -3,8 +3,10 @@ /** * ownCloud * - * @author Sam Tuke - * @copyright 2012 Sam Tuke samtuke@owncloud.org + * @copyright (C) 2014 ownCloud, Inc. + * + * @author Sam Tuke + * @author Bjoern Schiessle * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php index c512185522d..3f4d2c99e19 100644 --- a/apps/files_encryption/lib/helper.php +++ b/apps/files_encryption/lib/helper.php @@ -3,8 +3,10 @@ /** * ownCloud * - * @author Florin Peter - * @copyright 2013 Florin Peter + * @copyright (C) 2014 ownCloud, Inc. + * + * @author Florin Peter + * @author Bjoern Schiessle * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php index 53aaf435da8..0885267ece0 100644 --- a/apps/files_encryption/lib/keymanager.php +++ b/apps/files_encryption/lib/keymanager.php @@ -3,8 +3,9 @@ /** * ownCloud * - * @author Bjoern Schiessle - * @copyright 2012 Bjoern Schiessle + * @copyright (C) 2014 ownCloud, Inc. + * + * @author Bjoern Schiessle * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/apps/files_encryption/lib/migration.php b/apps/files_encryption/lib/migration.php index 59389911b5b..62a765d21f4 100644 --- a/apps/files_encryption/lib/migration.php +++ b/apps/files_encryption/lib/migration.php @@ -2,8 +2,9 @@ /** * ownCloud * - * @author Thomas Müller - * @copyright 2014 Thomas Müller deepdiver@owncloud.com + * @copyright (C) 2014 ownCloud, Inc. + * + * @author Thomas Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index 8c8ffd61207..0e8ca7319f0 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -3,10 +3,11 @@ /** * ownCloud * - * @author Bjoern Schiessle, Sam Tuke, Robin Appelman - * @copyright 2012 Sam Tuke - * 2012 Robin Appelman - * 2014 Bjoern Schiessle + * @copyright (C) 2014 ownCloud, Inc. + * + * @author Bjoern Schiessle + * @author Sam Tuke + * @author Robin Appelman * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php index 132748b6ea5..e4fef536235 100644 --- a/apps/files_encryption/lib/session.php +++ b/apps/files_encryption/lib/session.php @@ -2,8 +2,10 @@ /** * ownCloud * - * @author Sam Tuke - * @copyright 2012 Sam Tuke samtuke@owncloud.com + * @copyright (C) 2014 ownCloud, Inc. + * + * @author Sam Tuke + * @author Bjoern Schiessle * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index a1baecfb2f3..8299ed5fe6e 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -2,10 +2,11 @@ /** * ownCloud * - * @author Sam Tuke, Frank Karlitschek, Bjoern Schiessle - * @copyright 2012 Sam Tuke , - * Frank Karlitschek , - * Bjoern Schiessle + * @copyright (C) 2014 ownCloud, Inc. + * + * @author Sam Tuke , + * @author Frank Karlitschek , + * @author Bjoern Schiessle * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -- cgit v1.2.3