[tor-commits] [torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3

[erinn at torproject.org]

commit 7acecea502d3ff2e2e63639d7050140da0031032
Merge: f8630e8 e3e2457
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Apr 25 09:34:59 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/branding/about.png                   |  Bin 20908 -> 0 bytes
 build-scripts/branding/background.png              |  Bin 0 -> 32171 bytes
 build-scripts/branding/default16.png               |  Bin 0 -> 988 bytes
 build-scripts/branding/default24.png               |  Bin 0 -> 1918 bytes
 build-scripts/branding/default256.png              |  Bin 0 -> 48898 bytes
 build-scripts/branding/default32.png               |  Bin 0 -> 2775 bytes
 build-scripts/branding/default48.png               |  Bin 0 -> 5402 bytes
 build-scripts/branding/document.icns               |  Bin 0 -> 195435 bytes
 build-scripts/branding/document.ico                |  Bin 0 -> 54601 bytes
 .../branding/firefox-rebranding-instructions       |   35 -----------
 build-scripts/branding/firefox-torbrowser.diff     |   60 --------------------
 build-scripts/branding/firefox.icns                |  Bin 0 -> 242224 bytes
 build-scripts/branding/firefox.ico                 |  Bin 0 -> 75112 bytes
 build-scripts/branding/mozicon128.png              |  Bin 0 -> 19033 bytes
 build-scripts/branding/wizHeader.bmp               |  Bin 0 -> 34254 bytes
 build-scripts/branding/wizHeaderRTL.bmp            |  Bin 0 -> 34254 bytes
 build-scripts/branding/wizWatermark.bmp            |  Bin 0 -> 206038 bytes
 build-scripts/linux.mk                             |    1 +
 build-scripts/osx.mk                               |    1 +
 build-scripts/windows.mk                           |    1 +
 .../0013-Rebrand-Firefox-to-TorBrowser.patch       |   51 +++++++++++++++++
 21 files changed, 54 insertions(+), 95 deletions(-)