diff options
author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /node_modules/components-data/select.json | |
parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'node_modules/components-data/select.json')
-rw-r--r-- | node_modules/components-data/select.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/components-data/select.json b/node_modules/components-data/select.json index 33849fb6..123b935f 100644 --- a/node_modules/components-data/select.json +++ b/node_modules/components-data/select.json | |||
@@ -1,9 +1,9 @@ | |||
1 | { | 1 | { |
2 | "component": "select", | 2 | "component": "select", |
3 | 3 | ||
4 | "module": "montage/ui/select-input.reel", | 4 | "module": "montage/ui/native/select.reel", |
5 | 5 | ||
6 | "name": "SelectInput", | 6 | "name": "Select", |
7 | 7 | ||
8 | "properties": [ | 8 | "properties": [ |
9 | ] | 9 | ] |