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

Merge branch 'master' into window-transparency

Browse source 
Conflicts:
	script/lib/config.py
This commit is contained in:
Cheng Zhao 2015-01-12 13:39:32 -08:00
commit 21ba5b867d
47 changed files with 504 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/common/options_switches.h
View file

@ -48,6 +48,8 @@ extern const char kOverlayScrollbars[];
extern const char kOverlayFullscreenVideo[];
extern const char kSharedWorker[];
extern const char kDisableHttpCache[];
} // namespace switches
} // namespace atom