diff options
| author | Kruti Shah | 2012-06-20 15:12:48 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-20 15:12:48 -0700 |
| commit | 1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch) | |
| tree | 26ff4c6c5a94accfd5801f124244d3eef152a5c7 /js/io/ui/file-picker | |
| parent | 1ce4bd7033a413c7697888e5712f278219d6d095 (diff) | |
| parent | 782b66c783df4a9c36fa240cc77900e69b9130cf (diff) | |
| download | ninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/io/ui/file-picker')
| -rwxr-xr-x | js/io/ui/file-picker/file-input-field.reel/file-input-field.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html index c3209654..ff165f9a 100755 --- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html +++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | { | 12 | { |
| 13 | 13 | ||
| 14 | "newFileDirectory": { | 14 | "newFileDirectory": { |
| 15 | "prototype": "montage/ui/textfield.reel", | 15 | "prototype": "montage/ui/input-text.reel", |
| 16 | "properties": { | 16 | "properties": { |
| 17 | "element": {"#": "newFileDirectory"} | 17 | "element": {"#": "newFileDirectory"} |
| 18 | } | 18 | } |