aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorAnanya Sen2012-06-20 15:20:04 -0700
committerAnanya Sen2012-06-20 15:20:04 -0700
commitcaa9683fd259307658f96190a5c5bd771126fbb8 (patch)
tree83983a8819487ce8b33f65f5d20e34af2df8dd26 /js/stage
parentd852ea28dad399e84e8d5e69c0293500c30b59f1 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-caa9683fd259307658f96190a5c5bd771126fbb8.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/stage.reel/stage.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 7a9619cd..2ed596f3 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -31,7 +31,7 @@
31 }, 31 },
32 32
33 "textTool": { 33 "textTool": {
34 "prototype": "node_modules/labs/rich-text-editor.reel", 34 "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel",
35 "properties": { 35 "properties": {
36 "element" : {"#": "textToolObject"} 36 "element" : {"#": "textToolObject"}
37 } 37 }