Gregory Szorc faf262c4ee Merge mozilla-central into build-system ... Only conflict was configure.in amd was due to context, not changed lines themselves.		2013-02-25 22:09:18 -08:00
..
Makefile.in
moz.build	Bug 784841 - Part 18k: Convert /dom; f=Ms2ger rs=khuey	2013-02-25 12:47:20 -08:00
test_settings_basics.html	Bug 793239 - SettingsLock should have a state property to indicate if it is still valid; r=gwagner	2013-01-15 22:32:49 -05:00
test_settings_events.html
test_settings_onsettingchange.html	Bug 843711 - Fix up new |Components| culprits in test suite. r=mccr8	2013-02-25 10:43:03 -08:00