Merge branch 'master' into linux

Conflicts: atom.gyp vendor/apm vendor/brightray
2014-02-14 13:17:00 +00:00 · 2014-02-14 13:17:00 +00:00 · 4051d2ebdb
commit 4051d2ebdb
parent 2c28725722 dd4e36a42e
85 changed files with 611 additions and 473 deletions
--- a/common.gypi
+++ b/common.gypi
@ -223,5 +223,14 @@
        },
      },
    }],  # OS=="win"
+    # The breakdpad on Mac assumes Release_Base configuration.
+    ['OS=="mac"', {
+      'target_defaults': {
+        'configurations': {
+          'Release_Base': {
+          },
+        },
+      },
+    }],  # OS=="mac"
  ],
 }