aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-13 14:00:31 -0700
committerPushkar Joshi2012-06-13 14:00:31 -0700
commit596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch)
tree480f42ffc0782ca768284c1208a8f99adb5636a2 /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
parent75df16b937bb420e7d93a411e73f7b59578b1b7e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz
Merge branch 'master' into brushtool
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 },