Jason Duell d194b9d486 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
..
freetype2	bug 553272 - (freetype) validate counts in fvar header. r=blassey	2010-04-06 21:24:33 +01:00
lib7z	Bug 545316 - Make 7zip library return archive information. r=blassey	2010-05-19 16:37:11 -04:00
libbz2	Bug535369 - Compile bsdiff for host OS rather than target - r=ted.mielczarek	2010-02-19 11:58:45 -05:00
libimg	Backed out changeset 28b6961febf1	2010-03-11 09:22:58 +01:00
libjar	Bug 570488 - Fix loading of XPTs nested in JARs [2/2] r=mwu	2010-06-14 16:10:04 -07:00
libmar	Bug 533665 - Avoid the need to build NSPR for L10N repacks. r=robert.bugzilla a192=beltzner	2009-12-09 14:59:37 -08:00
libpr0n	Remove stray line breaks from NS_ERROR messages, since they interfere with log processing. rs=jst	2010-06-17 13:28:38 -07:00
libpref	Merge from m-c.	2010-06-22 17:33:57 -07:00
libreg	Bug 506041 Part 2: Correct misspellings in source code	2010-05-13 14:19:50 +02:00
plugin	Bug 572295: Add X11Util.h for X11 toolkits. r=karlt,joedrew	2010-06-21 15:35:49 -05:00
staticmod
zlib