mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 21:05:36 +00:00
386a098a89
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 |
||
---|---|---|
.. | ||
freetype2 | ||
lib7z | ||
libbz2 | ||
libimg | ||
libjar | ||
libmar | ||
libpr0n | ||
libpref | ||
libreg | ||
plugin | ||
staticmod | ||
zlib |