aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/binding-properties.reel/binding-properties.html
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/tools-properties/binding-properties.reel/binding-properties.html
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/tools-properties/binding-properties.reel/binding-properties.html')
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html
index 8271ff20..276b0eb9 100755
--- a/js/components/tools-properties/binding-properties.reel/binding-properties.html
+++ b/js/components/tools-properties/binding-properties.reel/binding-properties.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
42 "element": {"#": "bindingProperties"} 42 "element": {"#": "bindingProperties"}
43 } 43 }
44 } 44 }
45 } 45 }
46 </script> 46 </script>
47 47
48 </head> 48 </head>
49 49
50 <body> 50 <body>
@@ -56,4 +56,4 @@ POSSIBILITY OF SUCH DAMAGE.
56 56
57</html> 57</html>
58 58
59 59