diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html')
-rwxr-xr-x | js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html index 5ef13fab..572e5a60 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |||
@@ -219,7 +219,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
219 | "properties": { | 219 | "properties": { |
220 | "element": {"#": "rdioLocal"}, | 220 | "element": {"#": "rdioLocal"}, |
221 | "label": "Local", | 221 | "label": "Local", |
222 | "value": "Local", | ||
223 | "group": {"@": "axisModeGroup"}, | 222 | "group": {"@": "axisModeGroup"}, |
224 | "checked": true | 223 | "checked": true |
225 | } | 224 | } |
@@ -229,7 +228,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
229 | "properties": { | 228 | "properties": { |
230 | "element": {"#": "rdioGlobal"}, | 229 | "element": {"#": "rdioGlobal"}, |
231 | "label": "Global", | 230 | "label": "Global", |
232 | "value": "Global", | ||
233 | "group": {"@": "axisModeGroup"} | 231 | "group": {"@": "axisModeGroup"} |
234 | } | 232 | } |
235 | }, | 233 | }, |