Wes Kocher af6ad08f86 Merge inbound to m-c a=merge		2014-06-19 18:07:43 -07:00
..
Makefile.in	Bug 1011458 - Buy back a few characters for Windows paths by renaming tests staging directory. r=ted	2014-05-16 04:55:00 +02:00
moz.build
prefs_b2g_unittest.js	Bug 997244 - Move emulator.py out of marionette and into mozrunner, r=wlach,mdas,jgriffin	2014-06-19 14:17:26 -04:00
prefs_general.js	Bug 1022725: add a mock httpd.js Translation provider for tests. r=florian,felipe	2014-06-19 16:56:02 +02:00
webapps_mochitest.json	Bug 981249 - Test app launch. r=myk	2014-03-27 12:56:00 +01:00