Merge m-c to fx-team, a=merge

This commit is contained in:
Wes Kocher 2015-07-27 15:46:39 -07:00
commit 233bf172f4

View File

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
skip-if = (buildapp == 'b2g' || buildapp == 'mulet') || (os == "mac" && os_version == "10.6" && debug) #bug 1188052 for OSX 10.6
support-files =
hang_test.js
privatemode_perwindowpb.xul