aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color/colortoolbar.reel/colortoolbar.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-26 17:09:12 -0700
committerValerio Virgillito2012-04-26 17:09:12 -0700
commit7968f3a9cf56392c914d6bd44cc90145b6d807a3 (patch)
treeb632e72735c9a071078121be07cf8cba2ebf29cc /js/panels/color/colortoolbar.reel/colortoolbar.html
parentb03c3b087297f471840ab8595d5aa8bd0249a742 (diff)
parentbcfb200482c26b2bfc0d6577b1eb0de7a19a6762 (diff)
downloadninja-7968f3a9cf56392c914d6bd44cc90145b6d807a3.tar.gz
Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization
Diffstat (limited to 'js/panels/color/colortoolbar.reel/colortoolbar.html')
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.html5
1 files changed, 2 insertions, 3 deletions
diff --git a/js/panels/color/colortoolbar.reel/colortoolbar.html b/js/panels/color/colortoolbar.reel/colortoolbar.html
index 9ab54836..e32a475c 100755
--- a/js/panels/color/colortoolbar.reel/colortoolbar.html
+++ b/js/panels/color/colortoolbar.reel/colortoolbar.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2 2
3<!DOCTYPE html> 3<!DOCTYPE html>
4<!-- <copyright> 4<!-- <copyright>
@@ -16,8 +16,7 @@
16 { 16 {
17 17
18 "owner": { 18 "owner": {
19 "module": "js/panels/Color/colortoolbar.reel", 19 "prototype": "js/panels/Color/colortoolbar.reel[ColorToolbar]",
20 "name": "ColorToolbar",
21 "properties": { 20 "properties": {
22 "element": {"#": "colortoolbar"} 21 "element": {"#": "colortoolbar"}
23 } 22 }