Merge mozilla-central into services-central.
authorRichard Newman <rnewman@mozilla.com>
Wed, 06 Apr 2011 21:28:27 -0700
changeset 67770 d4505c71053eba68f3d827ead50ae7ed782ef527
parent 67769 d08e1abcb4e564f8287f1786b6a5bb9c700c7df5 (current diff)
parent 67593 e6b318aca78858379e640f6a1e1fa95522db71d7 (diff)
child 67771 f9299646f8eb451456a564ce82a3a31d17aa9dcd
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.2a1pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central into services-central.
--- a/mobile/locales/l10n.ini
+++ b/mobile/locales/l10n.ini
@@ -1,31 +1,11 @@
 [general]
 depth = ../..
-source-depth = ..
-all = locales/all-locales
+all = mobile/locales/all-locales
 
 [compare]
 dirs = mobile
-tld = mobile
 
 [includes]
 toolkit = toolkit/locales/l10n.ini
 services_sync = services/sync/locales/l10n.ini
 embedding_android = embedding/android/locales/l10n.ini
-
-[include_toolkit]
-type = hg
-mozilla = mozilla-central
-repo = http://hg.mozilla.org/
-l10n.ini = toolkit/locales/l10n.ini
-
-[include_services_sync]
-type = hg
-mozilla = mozilla-central
-repo = http://hg.mozilla.org/
-l10n.ini = services/sync/locales/l10n.ini
-
-[include_embedding_android]
-type = hg
-mozilla = mozilla-central
-repo = http://hg.mozilla.org/
-l10n.ini = embedding/android/locales/l10n.ini