Cheng Zhao 21ba5b867d Merge branch 'master' into window-transparency ... Conflicts: script/lib/config.py		2015-01-12 13:39:32 -08:00
..
app	Use PRODUCT_NAME as application name	2014-12-29 09:46:27 -08:00
browser	Merge branch 'master' into window-transparency	2015-01-12 13:39:32 -08:00
common	Merge branch 'master' into window-transparency	2015-01-12 13:39:32 -08:00
renderer	Fix cpplint warning	2015-01-08 12:51:15 -08:00