diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2012-03-06 20:44:31 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2012-03-06 20:44:31 +0000 |
| commit | b95f4776fd6999242435d547c29944861e1c2c41 (patch) | |
| tree | bae29debe13c9c4baf292404c69b815ef6928d9a /modules/watermark/helpers | |
| parent | 81020da574f1db9fd1315dd7149d11a00013ff29 (diff) | |
| parent | b167a3c50a3cecfaf726469ad7b0ee108fe32b00 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/watermark/helpers')
| -rw-r--r-- | modules/watermark/helpers/watermark.php | 2 | ||||
| -rw-r--r-- | modules/watermark/helpers/watermark_event.php | 2 | ||||
| -rw-r--r-- | modules/watermark/helpers/watermark_installer.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/watermark/helpers/watermark.php b/modules/watermark/helpers/watermark.php index 3fecb6bb..47301a6a 100644 --- a/modules/watermark/helpers/watermark.php +++ b/modules/watermark/helpers/watermark.php @@ -1,7 +1,7 @@ <?php defined("SYSPATH") or die("No direct script access."); /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2011 Bharat Mediratta + * Copyright (C) 2000-2012 Bharat Mediratta * * 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 diff --git a/modules/watermark/helpers/watermark_event.php b/modules/watermark/helpers/watermark_event.php index d0b14955..675bf68b 100644 --- a/modules/watermark/helpers/watermark_event.php +++ b/modules/watermark/helpers/watermark_event.php @@ -1,7 +1,7 @@ <?php defined("SYSPATH") or die("No direct script access."); /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2011 Bharat Mediratta + * Copyright (C) 2000-2012 Bharat Mediratta * * 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 diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php index 547daf6e..89489dc3 100644 --- a/modules/watermark/helpers/watermark_installer.php +++ b/modules/watermark/helpers/watermark_installer.php @@ -1,7 +1,7 @@ <?php defined("SYSPATH") or die("No direct script access."); /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2011 Bharat Mediratta + * Copyright (C) 2000-2012 Bharat Mediratta * * 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 |