Merge branch 'master' into chrome39

Conflicts:
	vendor/brightray
This commit is contained in:
Cheng Zhao 2014-12-09 15:49:06 -08:00
commit da3a988c8c
11 changed files with 80 additions and 66 deletions

View file

@ -23,3 +23,13 @@ TARGET_PLATFORM = {
'linux2': 'linux',
'win32': 'win32',
}[sys.platform]
verbose_mode = False
def enable_verbose_mode():
print 'Running in verbose mode'
global verbose_mode
verbose_mode = True
def is_verbose_mode():
return verbose_mode