Gregory Szorc de55b5242b 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
..
content	Merge mozilla-central into build-system	2013-03-12 13:04:55 -07:00
document	Bug 818246 - Part 5: Move XPIDLSRCS into moz.build (manual); r=glandium	2013-03-12 10:20:41 -07:00
templates	Merge mozilla-central into build-system	2013-03-12 13:04:55 -07: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