aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-30
|\ | | | | | | working
| * Merge pull request #5 from joseeight/ColorValerio Virgillito2012-01-30
| |\ | | | | | | IKNINJA-1083
| | * IKNINJA-1083Jose Antonio Marquez2012-01-30
| |/ | | | | | | Fixing minor bug with no color breaking on null alpha value.
| * Merge pull request #4 from ericguzman/CSSPanelUpdatesValerio Virgillito2012-01-30
| |\ | | | | | | CSSPanel Updates - Add new original CSS error icon
| | * CSSPanel Updates - Add new original CSS error iconEric Guzman2012-01-30
| | |
| * | Merge pull request #3 from mayhewinator/mastermayhewinator2012-01-30
| |\ \ | | |/ | |/| Code cleanup. Removing unnecessary Thumbs.db file from our assets folder.
| | * Removing unused file from assets/images. This file should not have been ↵John Mayhew2012-01-30
| | | | | | | | | | | | committed initially.
| * | Merge pull request #2 from jreid01/pullrequestValerio Virgillito2012-01-27
| |\ \ | | |/ | |/| Fixes to radio button base styles. Comment clean-up.
| | * Fixes to radio button base styles. Comment clean-up.Jon Reid2012-01-27
| | |
* | | updated from old repohwc4872012-01-27
|/ /
* | Merge pull request #1 from mqg734/ToolFixesValerio Virgillito2012-01-27
|\ \ | |/ |/| Fixed canvas width/height bug.
| * Updated canvas controller to override setProperties so we don't set styles ↵Nivesh Rajbhandari2012-01-27
|/ | | | | | when updating width and height. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Adding excluded list of files to gitignore and removed cloud/config.xml file.Valerio Virgillito2012-01-27
| | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
| | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* first commitPierre Frisch2011-12-22