Permalink
Browse files

merge default -> production

--HG--
branch : production
  • Loading branch information...
2 parents 319105c + 8a6cc93 commit 6b95d349b29b59db4de6a5af8b91e2683cd88218 @escapewindow escapewindow committed Feb 22, 2013
Showing with 5 additions and 1 deletion.
  1. +3 −0 .hgtags
  2. +1 −0 configs/unittests/mac_unittest.py
  3. +1 −1 mozharness/mozilla/testing/errors.py
View
@@ -941,3 +941,6 @@ ab733e7bb3d6e0caff78a00dc8d60c94cc3f054b FIREFOX_19_0b6_BUILD1
428c474cc43e960adc87026ea9d5b5cce11d01d1 FIREFOX_20_0b1_RELEASE
eea1e79ce523555db9695f22977f568fac1a0770 FIREFOX_20_0b1_RELEASE
eea1e79ce523555db9695f22977f568fac1a0770 FIREFOX_20_0b1_BUILD2
+428c474cc43e960adc87026ea9d5b5cce11d01d1 FENNEC_20_0b1_RELEASE
+57ffc6b2d1b16d8d211645948a936c2785b78ad4 FENNEC_20_0b1_RELEASE
+57ffc6b2d1b16d8d211645948a936c2785b78ad4 FENNEC_20_0b1_BUILD2
@@ -50,6 +50,7 @@
"plain5": ["--total-chunks=5", "--this-chunk=5", "--chunk-by-dir=4"],
"chrome": ["--chrome"],
"browser-chrome": ["--browser-chrome"],
+ "a11y": ["--a11y"],
"plugins": ['--setpref=dom.ipc.plugins.enabled=false',
'--setpref=dom.ipc.plugins.enabled.x86_64=false',
'--ipcplugins']
@@ -56,5 +56,5 @@
LogcatErrorList = [
{'substr': 'Fatal signal 11 (SIGSEGV)', 'level': ERROR, 'explanation': 'This usually indicates the B2G process has crashed'},
{'substr': 'Fatal signal 7 (SIGBUS)', 'level': ERROR, 'explanation': 'This usually indicates the B2G process has crashed'},
- {'substr': '[Javascript Error:', 'level': WARNING},
+ {'substr': '[JavaScript Error:', 'level': WARNING},
]

0 comments on commit 6b95d34

Please sign in to comment.