commit a402fe2f17a57bac80df772bd209b875e92ead6c Merge: 928e8ba 5af6c27 Author: Tomás Touceda chiiph@torproject.org Date: Fri Sep 9 10:47:53 2011 -0300

Merge branch 'feat2163_osxicons'

changes/feat2163 | 2 + src/vidalia/CMakeLists.txt | 6 +++ src/vidalia/HelperProcess.cpp | 17 ++++++++++ src/vidalia/HelperProcess.h | 2 + src/vidalia/MainWindow.cpp | 24 +++++++++++++- src/vidalia/config/AppearancePage.cpp | 28 ++++++++++++++++ src/vidalia/config/AppearancePage.ui | 55 ++++++++++++++++++++++++++++++++ src/vidalia/config/VidaliaSettings.cpp | 36 +++++++++++++++++++++ src/vidalia/config/VidaliaSettings.h | 14 ++++++++ 9 files changed, 183 insertions(+), 1 deletions(-)