1
0
Fork 0

Merge branch 'master' into virtual/master

closure/master
Mike Gerwitz 2011-06-10 23:11:31 -04:00
commit 72e5d481e6
2 changed files with 4 additions and 4 deletions

View File

@ -91,11 +91,11 @@ as the first argument to `Class.extend()`.
Multiple inheritance is not supported. ease.js is very generous with the options
it provides to developers as alternatives, so pick whichever flavor your are
most comfortable with: interfaces, traits or mixins. Multiple inheritance will
not be added in the future due to its problems which have been addressed by
*not* be added in the future due to problems which have been addressed by
interfaces and traits.
**Note that interfaces, traits and mixins are not yet available. They are
planned features and should be available shortly.**
**Note that traits and mixins are not yet available. They are
planned features and will be available in the future.**
````javascript
var SubFoo = Foo.extend(

View File

@ -1,7 +1,7 @@
{
"name": "easejs",
"description": "A basic collection of CommonJS modules intended to \"ease\" the transition into JavaScript from other Object-Oriented languages.",
"version": "0.1.0",
"version": "0.1.0-pre",
"author": "Mike Gerwitz <mike@mikegerwitz.com> (http://mikegerwitz.com)",
"homepage": "http://easejs.org",