Jason Duell 386a098a89 Merge from m-c. ... Fair amount of merge conflicts. Biggest item was changes to nsHttpChannel from web sockets changes. Other likely suspects if things are borken: nsFrameLoader.cpp: - nsFrameLoader::EnsureMessageManager: pass "this" (orig e10s code) or nsnull (m-c) to local process call to new nsFrameMessageManager(), callback arg? Smaug said null. - only calling SetCallBackData for local case. also +r smaug. nsPrefBranch.cpp had fairly extensive merge conflicts. nsChromeRegistry had lots of changes. Dougt did most of the non-necko changes (thanks). --HG-- rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h		2010-06-22 17:33:57 -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 from m-c.	2010-06-22 17:33:57 -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 566467 - fixed compilation with --disable-ipc. [r=ted]	2010-05-21 07:21:00 -04: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 564327 - Add Android widgets backend [2/2], patch by vlad, alexp, blassey, and me. r=dougt, sr=roc	2010-06-03 13:56:36 -07:00
xulrunner.rc
xulrunos2.rc	[OS/2] Bug 346690: Implement CSS3 CR cursor:none, OS/2 followup, r=mkaply	2008-01-19 00:35:49 -08:00