Commit 1f2e5a9f authored by Ed Morley's avatar Ed Morley
Browse files

Merge latest green b2g-inbound changeset and mozilla-central

parents 4a3a52db 5cc09def

.lldbinit

+6 −0
Original line number Diff line number Diff line
@@ -14,3 +14,9 @@ settings set target.prefer-dynamic-value run-target 
# than do any kind of searching, this assumes that you are running lldb from

# the top level source directory.

script sys.path.append('python/lldbutils'); import lldbutils; lldbutils.init()



# Show the string value in atoms.

type summary add nsIAtom --summary-string "${var.mString}"



# Show the value of text nodes.

type summary add nsTextNode --summary-string "${var.mText}"

accessible/src/windows/msaa/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ if CONFIG['MOZ_XUL']: 


LOCAL_INCLUDES += [

    '../../../../content/base/src',

    '../../../../content/events/src',

    '../../../../dom/events',

    '../../base',

    '../../generic',

    '../../html',

browser/app/profile/firefox.js

+1 −1
Original line number Diff line number Diff line
@@ -1333,7 +1333,7 @@ pref("browser.uiCustomization.debug", false); 


// The URL where remote content that composes the UI for Firefox Accounts should

// be fetched. Must use HTTPS.

pref("firefox.accounts.remoteUrl", "https://accounts.dev.lcip.org/flow?moar_native=true");

pref("firefox.accounts.remoteUrl", "https://accounts.dev.lcip.org/?service=sync");



// The URL of the Firefox Accounts auth server backend

pref("identity.fxaccounts.auth.uri", "https://api-accounts.dev.lcip.org/v1");

browser/config/mozconfigs/linux64/debug

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ ac_add_options --enable-debug 
ac_add_options --enable-trace-malloc

ac_add_options --enable-signmar



ac_add_options --disable-unified-compilation



. $topsrcdir/build/unix/mozconfig.linux



# Needed to enable breakpad in application.ini

browser/config/mozconfigs/linux64/debug-nonunified

0 → 100644
+3 −0
Original line number Diff line number Diff line 
. "$topsrcdir/browser/config/mozconfigs/linux64/debug"



ac_add_options --disable-unified-compilation