Merge mozilla-central to mozilla-inbound

This commit is contained in:
Ed Morley 2012-11-29 15:09:27 +00:00
commit 4f6e8306eb
3 changed files with 17 additions and 3 deletions

View File

@ -16,5 +16,12 @@
"VARIANT": "user",
"B2GUPDATER": "1"
},
"gaia": {"vcs": "hgtool", "repo": "http://hg.mozilla.org/projects/gaia"}
"gaia": {
"vcs": "hgtool",
"repo": "http://hg.mozilla.org/integration/gaia-nightly",
"l10n": {
"vcs": "hgtool",
"root": "http://hg.mozilla.org/gaia-l10n"
}
}
}

View File

@ -13,5 +13,12 @@
"{srcdir}/b2g/config/panda/README",
"{workdir}/sources.xml"
],
"gaia": {"vcs": "hgtool", "repo": "http://hg.mozilla.org/projects/gaia"}
"gaia": {
"vcs": "hgtool",
"repo": "http://hg.mozilla.org/integration/gaia-nightly",
"l10n": {
"vcs": "hgtool",
"root": "http://hg.mozilla.org/gaia-l10n"
}
}
}

View File

@ -18,7 +18,7 @@
},
"gaia": {
"vcs": "hgtool",
"repo": "http://hg.mozilla.org/projects/gaia",
"repo": "http://hg.mozilla.org/integration/gaia-nightly",
"l10n": {
"vcs": "hgtool",
"root": "http://hg.mozilla.org/gaia-l10n"