Gregory Szorc 3d694a85c0 Merge mozilla-central into build-system ... dom/interfaces/svg/Makefile.in and dom/media/Makefile.in had merge conflicts. They were resolved by hand. The former needed 2 IDLs removed. The latter had a context conflict for EXPORTS_NAMESPACES.		2013-03-12 13:04:55 -07:00
..
crashtests	Bug 806751 - Crashtest. r=me	2013-03-11 14:45:21 -07:00
idl	Merge mozilla-central into build-system	2013-03-12 13:04:55 -07:00
loader	Bug 848395 - GC: Move Rooted to JS namespace - rename js::Rooted to JS::Rooted outside SpiderMonkey r=terrence	2013-03-06 16:41:43 +00:00
public	Bug 784841 - Part 18s: Convert /js; r=glandium	2013-02-25 12:47:22 -08:00
shell	Bug 842438 (part 1) - Remove @line support from SpiderMonkey. r=benjamin.	2013-03-11 14:27:34 -07:00
src	Backed out changeset cc45fdc389df (Bug 779291) for breaking Mac Android builds.	2013-03-12 00:14:52 -07:00
tests	Merge mozilla-central into build-system	2013-03-12 13:04:55 -07:00
wrappers	Back out bug 846890 for reftest orange	2013-03-08 21:27:25 -08:00
Makefile.in	Bug 784841 - Part 18s: Convert /js; r=glandium	2013-02-25 12:47:22 -08:00
moz.build	Bug 784841 - Part 18s: Convert /js; r=glandium	2013-02-25 12:47:22 -08:00