[tor-commits] [vidalia/alpha] Merge branch 'dist-osx' into alpha

[chiiph at torproject.org]

commit 1fbfcbde24a6834fac1bc6ba1224f1efa69ef67c
Merge: d661bfb 3a1d2fa
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Fri Jan 6 10:55:40 2012 -0300

    Merge branch 'dist-osx' into alpha

 changes/newDistOSX        |    3 +
 cmake/VidaliaMacros.cmake |   38 ++++++++++++++++
 pkg/osx/CMakeLists.txt    |  108 ++++++++++-----------------------------------
 3 files changed, 64 insertions(+), 85 deletions(-)