summaryrefslogtreecommitdiff
path: root/bin/dthumb
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-02-28 18:35:06 +0100
committerDaniel Friesel <derf@finalrewind.org>2011-02-28 18:35:06 +0100
commit46cd0526adfe160984e36dcfc7af208b7ba6cd38 (patch)
treebeaf0edea9c6251078ad2d0941f08a678cec26b0 /bin/dthumb
parent9bad034398563ebea573eb3b9ba359ebfe39f875 (diff)
parentab5b9d1a29654e8bcda2c32ea80be6d9f9b87938 (diff)
Merge branch 'master' of aneurysm:var/git_root/dthumb
Conflicts: bin/dthumb
Diffstat (limited to 'bin/dthumb')
-rwxr-xr-xbin/dthumb8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/dthumb b/bin/dthumb
index 821f912..64c527a 100755
--- a/bin/dthumb
+++ b/bin/dthumb
@@ -127,11 +127,11 @@ E<lt>http://github.com/derf/dthumb/issuesE<gt>.
=head1 AUTHOR
-Copyright (C) 2009-2011 by Daniel Friesel E<lt>derf@chaosdorf.deE<gt>
+Copyright (C) 2009-2011 by Daniel Friesel E<lt>derf@chaosdorf.deE<gt>.
-The lightbox code is (C) by Lokesh Dhakar
-E<lt>http://huddletogether.com/projects/lightbox/E<gt>, licensed under
-CC-BY-2.5
+The shadowbox code is (C) 2007-2010 by Michael J. I. Jackson. See
+E<lt>http://www.shadowbox-js.com/E<gt> and especially
+E<lt>http://www.shadowbox-js.com/LICENSEE<gt>.
=head1 LICENSE