Commit 457d562c authored by Wes Kocher's avatar Wes Kocher
Browse files

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

parents b5154c4d 06e7c8d5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
[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