diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/layout/document-bar.reel/document-bar.html | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/layout/document-bar.reel/document-bar.html')
-rwxr-xr-x | js/components/layout/document-bar.reel/document-bar.html | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index a35b5590..889160ad 100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.html | |||
@@ -45,8 +45,6 @@ | |||
45 | "prototype": "js/components/layout/document-bar.reel", | 45 | "prototype": "js/components/layout/document-bar.reel", |
46 | "properties": { | 46 | "properties": { |
47 | "element": {"#": "documentBar"}, | 47 | "element": {"#": "documentBar"}, |
48 | "designView": {"#": "design"}, | ||
49 | "codeView": {"#": "code"}, | ||
50 | "zoomControl": {"@": "hottext1"} | 48 | "zoomControl": {"@": "hottext1"} |
51 | } | 49 | } |
52 | } | 50 | } |