Skip to content

Commit

Permalink
Bug 561032 - Move Firefox branding into browser/branding/official. r=…
Browse files Browse the repository at this point in the history
…gavin,r=pike
  • Loading branch information
glandium committed Apr 13, 2011
1 parent edcc8f6 commit 330d881
Show file tree
Hide file tree
Showing 41 changed files with 4 additions and 2 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = other-licenses/branding/firefox/locales
relativesrcdir = browser/branding/official/locales

include $(DEPTH)/config/autoconf.mk

Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion browser/confvars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ MOZ_APP_VERSION=$FIREFOX_VERSION
MOZ_EXTENSIONS_DEFAULT=" gnomevfs"
# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
MOZ_BRANDING_DIRECTORY=browser/branding/nightly
MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/firefox
MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
1 change: 1 addition & 0 deletions browser/locales/filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ def test(mod, path, entity = None):
if mod not in ("netwerk", "dom", "toolkit", "security/manager",
"browser", "extensions/reporter", "extensions/spellcheck",
"other-licenses/branding/firefox",
"browser/branding/official",
"services/sync"):
return False
if mod != "browser" and mod != "extensions/spellcheck":
Expand Down
1 change: 1 addition & 0 deletions browser/locales/l10n.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ all = browser/locales/all-locales
dirs = browser
extensions/reporter
other-licenses/branding/firefox
browser/branding/official

[includes]
# non-central apps might want to use %(topsrcdir)s here, or other vars
Expand Down

0 comments on commit 330d881

Please sign in to comment.