Doug Turner fe405e740c merge with m-c. resolved conflicts in: ... U chrome/src/nsChromeRegistry.cpp U content/base/src/Makefile.in U dom/base/nsDOMClassInfo.cpp U toolkit/toolkit-tiers.mk --HG-- rename : toolkit/mozapps/extensions/test/unit/test_bug541420.js => toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js		2010-05-11 11:09:54 -07:00
..
dlldeps-xul.cpp	Electrolysis-plugin-only bookkeeping commit.	2009-12-15 20:33:05 -05:00
dlldeps-zlib.cpp
libxul-config.mk	merge with m-c. resolved conflicts in:	2010-05-11 11:09:54 -07:00
libxul-rules.mk	Bug 524083 libmozqcms, libmozcairo, libmozlixpixman are not in libxul's depends r=bsmedberg	2009-11-02 17:17:27 +08:00
Makefile.in	Bug 448375 - Only depend on dbus-glib when needed. Depend on dbus instead [r=benjamin]	2010-04-24 09:39:53 +02:00
nsDllMain.cpp	Bug 464166 - wince should use custom dll entry point (like windows desktop) r=bsmedberg	2008-12-03 08:41:12 -05:00
nsGFXDeps.cpp
nsStaticXULComponents.cpp	Bug 553169: Implement InstallTrigger, the XPI content handler and confirmation for web triggered installs. r=robstrong, r=dveditz	2010-04-29 13:11:23 -07:00
xulrunner.rc
xulrunos2.rc