diff options
| author | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
| commit | f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch) | |
| tree | 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/io/system/fileio.js | |
| parent | 9253e2ce98d748edd8c3929f113a597923960387 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/properties.reel/properties.js
Signed-off-by: Jonathan Duran <jduran@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() { |