diff options
author | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
commit | 2c053ed58376c6709596ab48fc40dceb90d4e89d (patch) | |
tree | c8d0f78c2f47f373473419396d3c0855ec671eca /lib/_fla | |
parent | cb4a07568e84d853fbcd9d5eca37f572fa10786f (diff) | |
parent | 5479a8c3341247ca228026819f20f3ab5c34a80f (diff) | |
download | rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.gz rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.bz2 |
Merge branch 'master' into stable
Conflicts:
conf/msg
lib/plugins/acl/ajax.php
Diffstat (limited to 'lib/_fla')
-rw-r--r-- | lib/_fla/MultipleUpload.as | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/_fla/MultipleUpload.as b/lib/_fla/MultipleUpload.as index c5e7799f9..259441656 100644 --- a/lib/_fla/MultipleUpload.as +++ b/lib/_fla/MultipleUpload.as @@ -6,6 +6,7 @@ * @link http://blog.vixiom.com/2006/09/08/multiple-file-upload-with-flash-and-ruby-on-rails/ * @author Alastair Dawson * @author Andreas Gohr <andi@splitbrain.org> + * @license MIT <http://www.opensource.org/licenses/mit-license.php> */ // delegate |