Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 |
|\ | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html | ||
| * | Make Stage work after live preview | Jonathan Duran | 2012-02-08 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 |
|\| | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js | ||
| * | removing references to the old components in the app delegate | Valerio Virgillito | 2012-02-02 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
|/ | |||
* | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> |