[tor-commits] [torbrowser/maint-2.2] Merge remote-tracking branch 'origin/maint-2.2' into maint-2.2

[mikeperry@xxxxxxxxxxxxxx]

commit f41dc9a67c9ae96329edf926ab873faab38f5821
Merge: 0576295 9c8e987
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Tue May 1 15:44:16 2012 -0700

    Merge remote-tracking branch 'origin/maint-2.2' into maint-2.2

 build-scripts/config/mozconfig-osx-i386   |    7 +++++--
 build-scripts/config/mozconfig-osx-x86_64 |    9 ++++++---
 build-scripts/osx.mk                      |    4 ++--
 build-scripts/recommended-versions        |   18 +++++++++---------
 build-scripts/versions.mk                 |    2 +-
 changelog.osx-2.2                         |   14 ++++++++++++++
 6 files changed, 37 insertions(+), 17 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits