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
..
expat	Merge m-i to b-s.	2013-02-28 14:46:10 +01:00
html	Merge mozilla-central into build-system	2013-03-12 13:04:55 -07:00
htmlparser	Bug 818246 - Part 4: Move XPIDLSRCS into moz.build (auto); rs=glandium	2013-03-12 10:17:46 -07:00
xml	Bug 818246 - Part 4: Move XPIDLSRCS into moz.build (auto); rs=glandium	2013-03-12 10:17:46 -07:00
Makefile.in	Bug 784841 - Part 18α: Convert /parser; f=Ms2ger rs=khuey	2013-02-25 12:47:24 -08:00
moz.build	Bug 784841 - Part 18α: Convert /parser; f=Ms2ger rs=khuey	2013-02-25 12:47:24 -08:00
nsCharsetSource.h	Bug 234628 part 1 - Make the BOM take precedence over manual encoding overrides. r=smaug.	2013-01-18 16:27:03 +02:00