diff options
| author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
| commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
| tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/components-data | |
| parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
| parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
| download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/components-data')
| -rw-r--r-- | node_modules/components-data/textarea.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/components-data/textarea.json b/node_modules/components-data/textarea.json index 8e780954..0dd7714e 100644 --- a/node_modules/components-data/textarea.json +++ b/node_modules/components-data/textarea.json | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | "module": "montage/ui/textarea.reel", | 4 | "module": "montage/ui/textarea.reel", |
| 5 | 5 | ||
| 6 | "name": "TextArea", | 6 | "name": "Textarea", |
| 7 | 7 | ||
| 8 | "properties": [ | 8 | "properties": [ |
| 9 | 9 | ||