From a7516f3da5d36713c3169dcb54c55751a6080108 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 14 Apr 2013 23:24:46 +0800
Subject: [PATCH] Copy the default_app to bundle.

---
 atom.gyp                                                   | 6 ++++++
 browser/{atom => default_app}/index.html                   | 0
 browser/{atom/atom_content_demo.js => default_app/main.js} | 0
 vendor/node                                                | 2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)
 rename browser/{atom => default_app}/index.html (100%)
 rename browser/{atom/atom_content_demo.js => default_app/main.js} (100%)

diff --git a/atom.gyp b/atom.gyp
index 561a11fd8a9..7f85dd31aba 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -83,6 +83,12 @@
                 '<(PRODUCT_DIR)/<(product_name).framework',
               ],
             },
+            {
+              'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources',
+              'files': [
+                'browser/default_app',
+              ],
+            }
           ],
           'postbuilds': [
             {
diff --git a/browser/atom/index.html b/browser/default_app/index.html
similarity index 100%
rename from browser/atom/index.html
rename to browser/default_app/index.html
diff --git a/browser/atom/atom_content_demo.js b/browser/default_app/main.js
similarity index 100%
rename from browser/atom/atom_content_demo.js
rename to browser/default_app/main.js
diff --git a/vendor/node b/vendor/node
index 15315eb17c8..ff00d60bcf9 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 15315eb17c8aa0d27efc5a39530949f010085ac1
+Subproject commit ff00d60bcf92fdb229cf0326e31d1aff82ed357e