aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel/stage.html
diff options
context:
space:
mode:
authorJon Reid2012-06-20 15:05:26 -0700
committerJon Reid2012-06-20 15:05:26 -0700
commit6e6c146f6e59c3942076b5d2f46b2962cc709926 (patch)
treeaa6becc1e97aecbe6fb43aa33770def3c3de227d /js/stage/stage.reel/stage.html
parentf887a74a7d03a2008a2c43d455a2b3e9223028af (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-6e6c146f6e59c3942076b5d2f46b2962cc709926.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into timeline-local
Diffstat (limited to 'js/stage/stage.reel/stage.html')
-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 }