From 9dadb8c05ecddfe60c415c1ff62627e998148c77 Mon Sep 17 00:00:00 2001
 network/ r=jduell
---
 intl/strres/src/nsStringBundle.cpp         |    2 --
 intl/uconv/src/nsConverterInputStream.cpp  |    8 +++---
 intl/uconv/src/nsConverterInputStream.h    |    6 +++--
 netwerk/base/public/nsReadLine.h           |   38 +++-------------------------
 netwerk/base/src/nsFileStreams.cpp         |    9 +++----
 netwerk/base/src/nsFileStreams.h           |    3 ++-
 netwerk/base/src/nsSerializationHelper.cpp |   31 +++++------------------
 netwerk/base/src/nsSocketTransport2.cpp    |    1 -
 netwerk/cache/nsCacheMetaData.cpp          |    3 +--
 netwerk/cache/nsCacheMetaData.h            |    3 ++-
 netwerk/protocol/data/nsDataChannel.cpp    |   24 +++++++-----------
 11 files changed, 36 insertions(+), 92 deletions(-)

Bug 782412 - Part 2: Return NS_OK_UDEC_MOREINPUT and NS_OK_UDEC_MOREOUTPUT as appropriate. r=smontagu

--HG--
rename : intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp => intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
rename : intl/uconv/ucvlatin/nsUCS2BEToUnicode.h => intl/uconv/ucvlatin/nsUTF16ToUnicode.h
rename : intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp => intl/uconv/ucvlatin/nsUnicodeToUTF16.cpp
rename : intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h => intl/uconv/ucvlatin/nsUnicodeToUTF16.h

Fix an error in the UTF-8 state machine table, and clean up the table generally. Bug 811363, r=jfkthame.

--HG--
rename : intl/uconv/tests/unit/test_decode_x_mac_roman.js => intl/uconv/tests/unit/test_decode_macintosh.js
rename : intl/uconv/tests/unit/test_encode_x_mac_roman.js => intl/uconv/tests/unit/test_encode_macintosh.js

DONTBUILD because it only affects SeaMonkey

Backout 57d8f6cd245a (bug 803669), fb673c95d56b (bug 803665), 24d8e0cb73f2 (bug 803665), ac46bd0d9fba (bug 803669), c9c67b62799b (bug 803666), b3314c0ddaac (bug 803668) for debug build test failures

Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon

--HG--
extra : rebase_source : 98337b6a8c07d05e8c961a452dd05a7d75c3c60b

Backed out changeset 5298adc70963
Backed out changeset 86ccf7c918ce (bug 579517)

Code hygiene: don't use PR_TRUE and PR_FALSE, and use stdint types instead of PRInt types (no bug really, but you could say bug 579517)

Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon

Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon