aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data/range-input.json
diff options
context:
space:
mode:
authorhwc4872012-04-19 13:01:43 -0700
committerhwc4872012-04-19 13:01:43 -0700
commite6a20fe64574763483dc602bd759278ccf5e5e68 (patch)
tree69defe7200206f0257fe90697136fadef59d521e /node_modules/components-data/range-input.json
parentae7eb87564632ce7c676bd728b8ff2710ff0bb83 (diff)
parent9284c19f076dec3b47ece7dc7bcd22d74e4246c3 (diff)
downloadninja-e6a20fe64574763483dc602bd759278ccf5e5e68.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/rdge/materials/cloud-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js
Diffstat (limited to 'node_modules/components-data/range-input.json')
-rw-r--r--node_modules/components-data/range-input.json6
1 files changed, 5 insertions, 1 deletions
diff --git a/node_modules/components-data/range-input.json b/node_modules/components-data/range-input.json
index 871f7889..1f3f5b20 100644
--- a/node_modules/components-data/range-input.json
+++ b/node_modules/components-data/range-input.json
@@ -6,7 +6,11 @@
6 "name": "RangeInput", 6 "name": "RangeInput",
7 7
8 "properties": [ 8 "properties": [
9 9 {
10 "name": "value",
11 "type": "number",
12 "default": 0
13 },
10 { 14 {
11 "name": "min", 15 "name": "min",
12 "type": "number", 16 "type": "number",