| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/ninja-internal-master' into FileIO | Ananya Sen | 2012-02-29 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js js/document/html-document.js js/panels/properties/content.reel/content.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-02-24 |
| | | | | | | | | | | | | | Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js | ||
| * | | updating to codemirror 2.22 | Ananya Sen | 2012-02-27 |
| |/ | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |