Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 |
|\ | |||
| * | Support toggling between 2d and 3d canvas context. This requires us to ↵ | Nivesh Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Code cleanup - Removed extra log. | Valerio Virgillito | 2012-01-30 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||
* | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-01-30 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Stage.scss | ||
| * | | Code cleanup - Removed extra log. | Valerio Virgillito | 2012-01-31 |
| |/ | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@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> |