Permalink
Browse files

providing a changelog now; updated the license

  • Loading branch information...
1 parent 0a961c1 commit 2e94dcb6a9b5dafeea8181626c657445f788a25c @alto alto committed Nov 25, 2011
Showing with 48 additions and 6 deletions.
  1. +15 −0 CHANGELOG.md
  2. +1 −1 LICENSE
  3. +32 −5 README.md
View
@@ -0,0 +1,15 @@
+# CHANGELOG
+
+## 2.4.0
+
+ * supporting new DSL (which is much shorter)
+
+## 2.3.1
+
+ * bugfix: avoid naming conflict with i18n
+
+## 2.3.0
+
+ * supporting i18n
+ * supporting regular expressions for hash values and strings
+
View
@@ -1,4 +1,4 @@
-Copyright (c) 2008 Scott Barron
+Copyright (c) 2008-2011 Scott Barron
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
View
@@ -133,17 +133,44 @@ This example uses a few of the more complex features available.
end
```
+## Changelog ##
-# Other Stuff #
+Look at the [CHANGELOG](https://github.com/rubyist/aasm/blob/master/CHANGELOG.md) for details.
+
+
+## Authors ##
+
+* [Scott Barron](https://github.com/rubyist)
+* [Travis Tilley](https://github.com/ttilley)
+* [Thorsten Böttger](http://github.com/alto),
-Author:: Scott Barron <scott at elitists dot net>
-License:: Original code Copyright 2006, 2007, 2008 by Scott Barron.
- Released under an MIT-style license. See the LICENSE file
- included in the distribution.
## Warranty ##
This software is provided "as is" and without any express or
implied warranties, including, without limitation, the implied
warranties of merchantibility and fitness for a particular
purpose.
+
+## License ##
+
+Copyright (c) 2006-2011 Scott Barron
+
+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.

0 comments on commit 2e94dcb

Please sign in to comment.