Merge mozilla-central into services-central.

This commit is contained in:
Richard Newman 2011-04-06 21:28:27 -07:00
commit 6b9ced6036

View File

@ -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