Gregory Szorc 803629b9c6 Merge mozilla-central into build-system ... There were merges in configure.in and some Makefile.in. None had any conflicts. I spot verified the Makefile.in changes and confirmed that the changes did not touch any DIRS* variables.		2013-02-27 10:03:52 -08:00
..
crashtests	Bug 741218 - Don't crash when loading a page with content-type application/json; r=hsivonen	2012-04-03 09:25:38 +02:00
public	Bug 784841 - Part 18g: Convert /content; r=glandium	2013-02-25 12:47:19 -08:00
reftests
src	Merge mozilla-central into build-system	2013-02-27 10:03:52 -08:00
test	Merge mozilla-central into build-system	2013-02-27 10:03:52 -08:00
Makefile.in	Bug 784841 - Part 18g: Convert /content; r=glandium	2013-02-25 12:47:19 -08:00
moz.build	Bug 784841 - Part 18g: Convert /content; r=glandium	2013-02-25 12:47:19 -08:00