diff options
author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
tree | 762d98ba8852b858c03760f4b9bef294fae6486c /node_modules/montage/node.js | |
parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/node.js')
-rw-r--r-- | node_modules/montage/node.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/node_modules/montage/node.js b/node_modules/montage/node.js index 5ac51ed7..3d0a1edb 100644 --- a/node_modules/montage/node.js +++ b/node_modules/montage/node.js | |||
@@ -1,3 +1,8 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
1 | 6 | ||
2 | var FS = require("fs"); | 7 | var FS = require("fs"); |
3 | var PATH = require("path"); | 8 | var PATH = require("path"); |