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
..
android	Bug 567945 Android agent needs to build in mozilla-central r=ted	2010-06-21 14:26:55 -07:00
base	Merge from m-c.	2010-06-22 17:33:57 -07:00
browser	Remove stray line breaks from NS_ERROR messages, since they interfere with log processing. rs=jst	2010-06-17 13:28:38 -07:00
components	Merge from m-c.	2010-06-22 17:33:57 -07:00
examples
test	Test for bug 499115. r=bzbarsky	2009-06-26 09:46:31 +01:00
tests	Bug 561408 - "STL/XPCOM_GLUE build error in embedding/tests/winEmbed" [r=cjones] [a=dholbert_sheriff]	2010-04-23 10:50:00 -05:00
Makefile.in	Bug 564327 - Add Java wrapper in embedding/android [1/2]. patch by vlad, blassey, alexp, and me. r=dougt,ted	2010-06-02 14:55:28 -07:00