mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge branch 'master' into cj-replace-sparkle-with-squirrel

Browse source
This commit is contained in:
Cheng Zhao 2014-01-21 20:40:19 +08:00
commit ef8e5505c8
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common.gypi
View file

@ -207,5 +207,14 @@
}, },
}, },
}], # OS=="win" }], # OS=="win"
# The breakdpad on Mac assumes Release_Base configuration.
['OS=="mac"', {
'target_defaults': {
'configurations': {
'Release_Base': {
},
},
},
}], # OS=="mac"
], ],
} }

6
script/cpplint.py vendored
View file

@ -10,9 +10,9 @@ IGNORE_FILES = [
'browser/atom_application_mac.h', 'browser/atom_application_mac.h',
'browser/atom_application_delegate_mac.h', 'browser/atom_application_delegate_mac.h',
'browser/native_window_mac.h', 'browser/native_window_mac.h',
'browser/ui/atom_event_processing_window.h', 'browser/ui/cocoa/event_processing_window.h',
'browser/ui/atom_menu_controller_mac.h', 'browser/ui/cocoa/atom_menu_controller.h',
'browser/ui/nsalert_synchronous_sheet_mac.h', 'browser/ui/cocoa/nsalert_synchronous_sheet.h',
'common/api/api_messages.cc', 'common/api/api_messages.cc',
'common/api/api_messages.h', 'common/api/api_messages.h',
'common/atom_version.h', 'common/atom_version.h',