Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding

1 files changed, 5 insertions, 0 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 52a6daa2..7c3bc2c4 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -321,6 +321,10 @@
                 "prototype": "js/controllers/code-editor-controller"
             },
 
+            "objectsController" : {
+                "prototype": "js/controllers/objects-controller"
+            },
+
             "owner": {
                 "prototype": "js/ninja.reel",
                 "properties": {
@@ -350,6 +354,7 @@
                     "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"},
                     "codeEditorController": {"@": "codeEditorController"},
+                    "objectsController":    {"@": "objectsController"},
                     "rightPanelContainer":  {"#": "rightPanelContainer" },
                     "panelSplitter":        {"@": "splitter3"},
                     "timelineSplitter":     {"@": "splitter4"},