| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| |\ | |||
| | * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-08 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js | ||
| | * | | updated from old repo | hwc487 | 2012-01-27 |
| | | | | |||
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 |
| |\ \ \ | | |/ | |/| | |||
| | * | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵ | Nivesh Rajbhandari | 2012-02-07 |
| | |/ | | | | | | | | | | | makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@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> | |||