aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties
Commit message (Expand)AuthorAge
* Merge from /joseeight/ninja-internal/tree/FileIOAnanya Sen2012-02-10
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\
| * Merge branch 'master' into pentoolPushkar Joshi2012-02-08
| |\
| * \ Merge branch 'master' into pentoolPushkar Joshi2012-02-07
| |\ \
| * | | missed a couple of pen tool property files on last checkinPushkar Joshi2012-01-30
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #21 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\ \ \
| | * | | IKNINJA - 1084: Fixing the custom tag.Valerio Virgillito2012-02-07
| | | |/ | | |/|
| * | | Added ability to toggle combobox's visibility so we can show/hide materials c...Nivesh Rajbhandari2012-02-07
| * | | Updated tools and PI to get/set materials by binding to appModel's materials ...Nivesh Rajbhandari2012-02-07
| |/ /
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| |
| * | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ...Nivesh Rajbhandari2012-02-02
| |/
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27