[Pkg-privacy-commits] [vidalia] 84/160: Merge commit 'upstream/0.2.15'

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository vidalia.

commit 1b0f174c6217f3eb6cd2cc5eae8cf639c0f63780
Merge: 3e343f8 4031b66
Author: Dererk <dererk at debian.org>
Date:   Tue Nov 15 17:10:52 2011 -0300

    Merge commit 'upstream/0.2.15'

 CHANGELOG                                 | 18 ++++++
 CMakeLists.txt                            |  2 +-
 changes/bug2188                           |  2 +
 changes/bug2644                           |  3 +
 changes/bug3342                           |  2 +
 changes/bug3759                           |  3 +
 changes/bug3843                           |  2 +
 changes/feat2163                          |  2 +
 src/vidalia/CMakeLists.txt                |  6 ++
 src/vidalia/HelperProcess.cpp             | 17 ++++++
 src/vidalia/HelperProcess.h               |  2 +
 src/vidalia/MacOSXBundleInfo.plist.in     | 38 ++++++++++++
 src/vidalia/MainWindow.cpp                | 44 ++++++++++++--
 src/vidalia/bwgraph/GraphFrame.cpp        | 45 +++++++++++---
 src/vidalia/bwgraph/GraphFrame.h          |  4 ++
 src/vidalia/config/AdvancedPage.cpp       | 16 ++++-
 src/vidalia/config/AppearancePage.cpp     | 28 +++++++++
 src/vidalia/config/AppearancePage.ui      | 55 +++++++++++++++++
 src/vidalia/config/ServerPage.cpp         | 99 +++++++++++++++++++------------
 src/vidalia/config/ServerPage.ui          | 17 ++++--
 src/vidalia/config/ServerSettings.cpp     | 18 +++++-
 src/vidalia/config/ServerSettings.h       |  6 ++
 src/vidalia/config/VidaliaSettings.cpp    | 34 +++++++++++
 src/vidalia/config/VidaliaSettings.h      | 14 +++++
 src/vidalia/i18n/po/templates/vidalia.pot | 60 +++++++++----------
 src/vidalia/log/StatusEventItem.cpp       | 12 ++--
 src/vidalia/log/StatusEventItem.h         |  6 +-
 src/vidalia/log/StatusEventWidget.cpp     |  4 +-
 28 files changed, 459 insertions(+), 100 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git