diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/io/system/fileio.js | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/io/system/fileio.js')
| -rwxr-xr-x | js/io/system/fileio.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/io/system/fileio.js b/js/io/system/fileio.js index f78ad173..1680ca7f 100755 --- a/js/io/system/fileio.js +++ b/js/io/system/fileio.js | |||
| @@ -146,7 +146,7 @@ exports.FileIo = Montage.create(Component, { | |||
| 146 | } | 146 | } |
| 147 | }, | 147 | }, |
| 148 | //////////////////////////////////////////////////////////////////// | 148 | //////////////////////////////////////////////////////////////////// |
| 149 | // | 149 | //TODO: Add functionality |
| 150 | deleteFile: { | 150 | deleteFile: { |
| 151 | enumerable: true, | 151 | enumerable: true, |
| 152 | value: function() { | 152 | value: function() { |
| @@ -159,7 +159,7 @@ exports.FileIo = Montage.create(Component, { | |||
| 159 | } | 159 | } |
| 160 | }, | 160 | }, |
| 161 | //////////////////////////////////////////////////////////////////// | 161 | //////////////////////////////////////////////////////////////////// |
| 162 | // | 162 | //TODO: Add functionality |
| 163 | copyFile: { | 163 | copyFile: { |
| 164 | enumerable: true, | 164 | enumerable: true, |
| 165 | value: function() { | 165 | value: function() { |