diff options
author | Daniel Friesel <derf@finalrewind.org> | 2011-02-28 18:35:06 +0100 |
---|---|---|
committer | Daniel Friesel <derf@finalrewind.org> | 2011-02-28 18:35:06 +0100 |
commit | 46cd0526adfe160984e36dcfc7af208b7ba6cd38 (patch) | |
tree | beaf0edea9c6251078ad2d0941f08a678cec26b0 /bin | |
parent | 9bad034398563ebea573eb3b9ba359ebfe39f875 (diff) | |
parent | ab5b9d1a29654e8bcda2c32ea80be6d9f9b87938 (diff) |
Merge branch 'master' of aneurysm:var/git_root/dthumb
Conflicts:
bin/dthumb
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/dthumb | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 |