aboutsummaryrefslogtreecommitdiff
path: root/assets
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\
| * removing shadersPushkar Joshi2012-02-09
| |
| * changes to allow minimal rendering ofnon-animated materials.hwc4872012-02-01
| |
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-31
| |\ | | | | | | | | | working
| * \ Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-30
| |\ \ | | | | | | | | | | | | working
| * | | updated from old repohwc4872012-01-27
| | | |
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-01-30
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Stage.scss
| * | | Removed unused images and reduced the size of the larger image files used ↵John Mayhew2012-01-30
| | |/ | |/| | | | | | | for shaders.
| * | Removing unused file from assets/images. This file should not have been ↵John Mayhew2012-01-30
| |/ | | | | | | committed initially.
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>