Doug Turner b2c88178e3 Merging with M-C. ... Hand merged the following files: U chrome/src/nsChromeRegistry.cpp U chrome/src/nsChromeRegistry.h U content/base/src/nsFrameLoader.cpp U content/base/src/nsFrameLoader.h U dom/src/geolocation/nsGeolocation.cpp U dom/src/geolocation/nsGeolocation.h U netwerk/build/Makefile.in U netwerk/cookie/nsCookieService.cpp U netwerk/cookie/nsCookieService.h --HG-- rename : extensions/cookie/test/unit/test_cookies.js => extensions/cookie/test/unit/test_cookies_thirdparty.js rename : netwerk/cookie/src/nsCookieService.cpp => netwerk/cookie/nsCookieService.cpp rename : netwerk/cookie/src/nsCookieService.h => netwerk/cookie/nsCookieService.h rename : netwerk/dns/src/nsIDNKitInterface.h => netwerk/dns/nsIDNKitInterface.h rename : netwerk/protocol/http/src/nsHttp.h => netwerk/protocol/http/nsHttp.h rename : netwerk/protocol/http/src/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannel.cpp rename : netwerk/protocol/http/src/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannel.h rename : netwerk/protocol/http/src/nsHttpChunkedDecoder.h => netwerk/protocol/http/nsHttpChunkedDecoder.h rename : netwerk/protocol/http/src/nsHttpHandler.cpp => netwerk/protocol/http/nsHttpHandler.cpp rename : netwerk/protocol/http/src/nsHttpHeaderArray.h => netwerk/protocol/http/nsHttpHeaderArray.h rename : netwerk/protocol/http/src/nsHttpRequestHead.h => netwerk/protocol/http/nsHttpRequestHead.h rename : netwerk/protocol/http/src/nsHttpResponseHead.h => netwerk/protocol/http/nsHttpResponseHead.h rename : netwerk/protocol/http/src/nsHttpTransaction.cpp => netwerk/protocol/http/nsHttpTransaction.cpp rename : netwerk/protocol/res/src/nsResProtocolHandler.cpp => netwerk/protocol/res/nsResProtocolHandler.cpp rename : netwerk/protocol/res/src/nsResProtocolHandler.h => netwerk/protocol/res/nsResProtocolHandler.h		2010-06-07 13:38:02 -07:00
..
android	Bug 568249 - Support geolocation on Android, r=dougt	2010-06-04 14:14:43 -07:00
base	Bug 548847 - [E10s] forward modal (chrome) dialogs from content to chrome, r=jst	2010-05-17 14:25:22 +03:00
browser	Bug 565904 - "HTMLOptGroupElement and HTMLOptionElement are not form controls but are listed in nsIFormControl" [r=smaug]	2010-05-27 06:51:00 -04:00
components	Merge with latest mozilla central r 42802:ffbc3baf03ae	2010-05-25 15:19:33 -04: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