aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\
| * Merge branch 'montage-integration' into stagingValerio Virgillito2012-02-02
| |\
| | * Fixed the color popups to work with m-js v6Jose Antonio Marquez2012-02-02
| | * upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | * Fixes for montage integrationValerio Virgillito2012-02-01
| * | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| * | Fixes for montage integrationValerio Virgillito2012-02-02
| * | Merge pull request #12 from mqg734/ToolFixesValerio Virgillito2012-02-02
| |\ \
| | * | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ...Nivesh Rajbhandari2012-02-02
| | * | Fixing 3d section of the PI.Nivesh Rajbhandari2012-01-31
| | * | Support stage in PI's 3d section.Nivesh Rajbhandari2012-01-31
| | * | Merging Jose's colorchip change.Nivesh Rajbhandari2012-01-31
| | * | CSSPanel Updates - Add new original CSS error iconEric Guzman2012-01-30
| * | | Delete unneeded compass log file (IKNINJA 1101).Jon Reid2012-02-01
| | |/ | |/|
| * | IKNINJA-1083Jose Antonio Marquez2012-02-01
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-01-30
|\| |
| * | CSSPanel Updates - Add new original CSS error iconEric Guzman2012-01-30
| |/
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27