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

Mon Apr 23 17:20:56 UTC 2012

commit a7d1ca21fba87b8f3d1091e803972899531294bd
Merge: 3cd7c2c 300c2ef
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Apr 23 14:20:32 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/config/mozconfig-osx-i386            |   11 ++--
 build-scripts/linux.mk                             |    2 +-
 build-scripts/osx.mk                               |   26 +++++----
 build-scripts/versions.mk                          |   34 ++++++++---
 build-scripts/windows.mk                           |    6 +-
 docs/buildmachine_setups/osx.txt                   |   37 ++++++++++++
 .../0001-Adapt-paths-etc-for-OS-X-TBB.patch        |   61 ++++++++++++++++++++
 7 files changed, 148 insertions(+), 29 deletions(-)