aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
diff options
context:
space:
mode:
authorAnanya Sen2012-06-19 11:00:49 -0700
committerAnanya Sen2012-06-19 11:00:49 -0700
commitf1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch)
tree31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
parent9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html')
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html2
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 },