aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorJonathan Duran2012-06-20 15:04:45 -0700
committerJonathan Duran2012-06-20 15:04:45 -0700
commitc6ae80c488621d4ac189cb63309b6258115f823a (patch)
treedfa26112e1830972fcb212bbb5b17c9a901c645f /js/stage
parent022e714cb5d10cd8575ab9907eddfb184a990b66 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
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 }