diff options
| author | Marcel Molina <marcel@vernix.org> | 2005-11-17 00:48:16 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2005-11-17 00:48:16 +0000 |
| commit | e54147145f5e90edcbfa393a510a0e92cc3e9231 (patch) | |
| tree | a22cf7427a5e0120b6822053fb4a635ca140e751 /actionwebservice | |
| parent | 5cb2aa722deea44a9aac1ec2469611759a22bf75 (diff) | |
| download | rails-e54147145f5e90edcbfa393a510a0e92cc3e9231.tar.gz rails-e54147145f5e90edcbfa393a510a0e92cc3e9231.tar.bz2 rails-e54147145f5e90edcbfa393a510a0e92cc3e9231.zip | |
Update from LGPL to MIT license as per Minero Aoki's permission.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3067 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionwebservice')
| -rw-r--r-- | actionwebservice/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionwebservice/setup.rb | 25 |
2 files changed, 24 insertions, 3 deletions
diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG index 814d823d7f..62d72d4e3d 100644 --- a/actionwebservice/CHANGELOG +++ b/actionwebservice/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Update from LGPL to MIT license as per Minero Aoki's permission. [Marcel Molina Jr.] + * Rename Version constant to VERSION. #2802 [Marcel Molina Jr.] * Fix that XML-RPC date/time values did not have well-defined behaviour (#2516, #2534). This fix has one caveat, in that we can't support pre-1970 dates from XML-RPC clients. diff --git a/actionwebservice/setup.rb b/actionwebservice/setup.rb index 0807023db2..9ab880d357 100644 --- a/actionwebservice/setup.rb +++ b/actionwebservice/setup.rb @@ -3,9 +3,28 @@ # # Copyright (c) 2000-2004 Minero Aoki # -# This program is free software. -# You can distribute/modify this program under the terms of -# the GNU LGPL, Lesser General Public License version 2.1. +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Note: Originally licensed under LGPL v2+. Using MIT license for Rails +# with permission of Minero Aoki. + # unless Enumerable.method_defined?(:map) # Ruby 1.4.6 |