[Pkg-privacy-commits] [vidalia] 04/26: Merge tag 'upstream/0.3.1' into debian/experimental

Ximin Luo infinity0 at moszumanska.debian.org
Sat Aug 22 13:15:29 UTC 2015


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

infinity0 pushed a commit to branch experimental
in repository vidalia.

commit f81a95204c2190c7fa727c7249bc9fd2a293e87f
Merge: 9c6b2b5 125b3f3
Author: Dererk <dererk at debian.org>
Date:   Wed Mar 7 11:08:41 2012 -0300

    Merge tag 'upstream/0.3.1' into debian/experimental
    
    Upstream version 0.3.1

 CHANGELOG                                          |   97 +
 CMakeLists.txt                                     |    4 +-
 cmake/VidaliaMacros.cmake                          |   38 +
 doc/plugin-framework.txt                           |  153 +
 pkg/osx/CMakeLists.txt                             |  108 +-
 src/common/win32.cpp                               |    2 +-
 src/torcontrol/TorControl.cpp                      |   45 +-
 src/torcontrol/TorControl.h                        |    4 +
 src/vidalia/CMakeLists.txt                         |   28 +
 src/vidalia/HelperProcess.cpp                      |   17 +
 src/vidalia/HelperProcess.h                        |    2 +
 src/vidalia/MacOSXBundleInfo.plist.in              |   38 +
 src/vidalia/MainWindow.cpp                         |  717 ++--
 src/vidalia/MainWindow.h                           |   61 +-
 src/vidalia/StatusTab.ui                           |   30 +-
 src/vidalia/VAttachButton.cpp                      |   58 +
 src/vidalia/VAttachButton.h                        |   50 +
 src/vidalia/VMessageBox.cpp                        |   55 +-
 src/vidalia/VMessageBox.h                          |   11 +-
 src/vidalia/VTabWidget.cpp                         |   10 +-
 src/vidalia/VTabWidget.h                           |    3 +
 src/vidalia/Vidalia.cpp                            |   16 +
 src/vidalia/Vidalia.h                              |    2 +-
 src/vidalia/VidaliaTab.cpp                         |    8 +
 src/vidalia/VidaliaTab.h                           |    4 +
 src/vidalia/bwgraph/BandwidthGraph.ui              |  748 ++--
 src/vidalia/bwgraph/GraphFrame.cpp                 |   45 +-
 src/vidalia/bwgraph/GraphFrame.h                   |    4 +
 src/vidalia/config/AdvancedPage.cpp                |   61 +-
 src/vidalia/config/AdvancedPage.h                  |    6 +
 src/vidalia/config/AdvancedPage.ui                 |  141 +-
 src/vidalia/config/AppearancePage.cpp              |   28 +
 src/vidalia/config/AppearancePage.ui               |   55 +
 src/vidalia/config/NetworkPage.cpp                 |   71 +-
 src/vidalia/config/NetworkPage.h                   |    7 -
 src/vidalia/config/NetworkSettings.cpp             |   12 -
 src/vidalia/config/NetworkSettings.h               |    5 +-
 src/vidalia/config/ServerPage.cpp                  |   41 +-
 src/vidalia/config/ServerPage.h                    |    6 +
 src/vidalia/config/ServerPage.ui                   |  117 +-
 src/vidalia/config/ServerSettings.cpp              |    4 +-
 src/vidalia/config/TorSettings.cpp                 |   20 +
 src/vidalia/config/TorSettings.h                   |    7 +
 src/vidalia/config/TorrcDialog.ui                  |  120 +-
 src/vidalia/config/VidaliaSettings.cpp             |   70 +
 .../{VidaliaSettings.cpp => VidaliaSettings.cpp~}  |   73 +
 src/vidalia/config/VidaliaSettings.h               |   30 +
 .../{VidaliaSettings.h => VidaliaSettings.h~}      |   32 +
 src/vidalia/help/content/en/config.html            |   12 +-
 src/vidalia/help/content/po/en/config.po           |   14 +-
 src/vidalia/help/content/po/templates/config.pot   |   12 +-
 src/vidalia/i18n/po/ar/vidalia_ar.po               |  306 +-
 src/vidalia/i18n/po/bg/vidalia_bg.po               |    8 +-
 src/vidalia/i18n/po/cs/vidalia_cs.po               |  333 +-
 src/vidalia/i18n/po/da/vidalia_da.po               | 4378 +++++++++++---------
 src/vidalia/i18n/po/de/vidalia_de.po               |  456 +-
 src/vidalia/i18n/po/el/vidalia_el.po               |  193 +-
 src/vidalia/i18n/po/eo/vidalia_eo.po               |   30 +-
 src/vidalia/i18n/po/es/vidalia_es.po               |  493 +--
 src/vidalia/i18n/po/fa/vidalia_fa.po               | 2454 ++++++-----
 src/vidalia/i18n/po/fr/vidalia_fr.po               | 1602 ++++---
 src/vidalia/i18n/po/gu/vidalia_gu.po               |    4 +-
 src/vidalia/i18n/po/he/vidalia_he.po               |   35 +-
 src/vidalia/i18n/po/hi/vidalia_hi.po               |    4 +-
 src/vidalia/i18n/po/hu/vidalia_hu.po               | 1166 +++---
 src/vidalia/i18n/po/id/vidalia_id.po               |   24 +-
 src/vidalia/i18n/po/is/vidalia_is.po               |    4 +-
 src/vidalia/i18n/po/it/vidalia_it.po               |  482 +--
 src/vidalia/i18n/po/my/vidalia_my.po               |  138 +-
 src/vidalia/i18n/po/nb/vidalia_nb.po               |  169 +-
 src/vidalia/i18n/po/nl/vidalia_nl.po               |  615 ++-
 src/vidalia/i18n/po/pl/vidalia_pl.po               |  234 +-
 src/vidalia/i18n/po/pt/vidalia_pt.po               |  295 +-
 src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po         | 1012 +++--
 src/vidalia/i18n/po/ru/vidalia_ru.po               |  548 ++-
 src/vidalia/i18n/po/th/vidalia_th.po               |  102 +-
 src/vidalia/i18n/po/tr/vidalia_tr.po               |  140 +-
 src/vidalia/i18n/po/vi/vidalia_vi.po               |  103 +-
 src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po         |   52 +-
 src/vidalia/log/StatusEventItem.cpp                |   12 +-
 src/vidalia/log/StatusEventItem.h                  |    6 +-
 src/vidalia/log/StatusEventWidget.cpp              |    4 +-
 src/vidalia/main.cpp                               |    4 +-
 src/vidalia/network/NetViewer.cpp                  |   12 +
 src/vidalia/network/NetViewer.h                    |    3 +
 src/vidalia/network/NetViewer.ui                   |   91 +-
 src/vidalia/network/RouterListWidget.cpp           |   34 +
 src/vidalia/network/RouterListWidget.h             |    5 +
 src/vidalia/plugin/DebugDialog.cpp                 |   69 +
 src/vidalia/plugin/DebugDialog.h                   |   49 +
 src/vidalia/plugin/DebugDialog.ui                  |   64 +
 src/vidalia/plugin/PluginEngine.cpp                |  221 +
 src/vidalia/plugin/PluginEngine.h                  |   62 +
 src/vidalia/plugin/PluginWrapper.cpp               |  244 ++
 src/vidalia/plugin/PluginWrapper.h                 |   68 +
 .../plugin/prototypes/HelperProcessPrototype.cpp   |  100 +
 .../plugin/prototypes/HelperProcessPrototype.h     |   32 +
 .../plugin/prototypes/TorControlPrototype.cpp      |  428 ++
 .../plugin/prototypes/TorControlPrototype.h}       |  192 +-
 .../plugin/prototypes/VidaliaTabPrototype.cpp      |   75 +
 .../plugin/prototypes/VidaliaTabPrototype.h        |   42 +
 src/vidalia/res/16x16/detach-arrow.png             |  Bin 0 -> 602 bytes
 src/vidalia/res/credits.html                       |    1 +
 src/vidalia/res/vidalia.qrc                        |    1 +
 104 files changed, 11542 insertions(+), 8959 deletions(-)

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



More information about the Pkg-privacy-commits mailing list