aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 00:45:26 -0700
committerArmen Kesablyan2012-06-19 00:45:26 -0700
commitc59eb371559a3061ce53223e249ca97daace5968 (patch)
treef9540e26c0f273d35f92010605da65dd85bbe70c /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
parent0f040acabfb7a4bf3138debec5aff869487ceb11 (diff)
parent918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff)
downloadninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
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 },