diff options
| author | Nivesh Rajbhandari | 2012-04-04 17:24:27 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-04 17:24:27 -0700 |
| commit | 01cf259da7aaa7d70789d9a7c32111d88b477463 (patch) | |
| tree | 0bff3395ac681e5f685d2267f7dbc03a8e32bc4a | |
| parent | 331ea08655245e3532e48bf160d5f68a04d8723f (diff) | |
| parent | 13368ca6ebbc13adeafccd898dfffd7ce37cb28a (diff) | |
| download | ninja-01cf259da7aaa7d70789d9a7c32111d88b477463.tar.gz | |
Merge branch 'refs/heads/ToolFixes' into WebGLMaterials
Conflicts:
js/document/templates/montage-html/default_html.css
js/mediators/element-mediator.js
js/panels/properties.reel/properties.js
js/tools/BrushTool.js
js/tools/LineTool.js
js/tools/PenTool.js
js/tools/SelectionTool.js
js/tools/ShapeTool.js
js/tools/TranslateObject3DTool.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>