[Pkg-cli-apps-commits] [keepass2] 02/06: Merge tag 'upstream/2.34+dfsg'

[Julian Taylor]

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

jtaylor-guest pushed a commit to branch master
in repository keepass2.

commit cf37689691a00d97b65265651ad08675207001b2
Merge: de62aaf ce0aed7
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Mon Jun 27 19:51:19 2016 +0200

    Merge tag 'upstream/2.34+dfsg'
    
    Upstream version 2.34+dfsg

 Docs/Chm/default.css                               |  69 ++++---
 Docs/Chm/help/base/autotype.html                   |  59 +++---
 Docs/Chm/help/base/faq.html                        |   4 +-
 Docs/Chm/help/base/faq_tech.html                   |   8 +-
 Docs/Chm/help/base/fieldrefs.html                  |   2 +-
 Docs/Chm/help/base/integration.html                |   2 +-
 Docs/Chm/help/base/keys.html                       |   3 +-
 Docs/Chm/help/v2/autotype_obfuscation.html         |   4 +-
 Docs/Chm/help/v2/plugins.html                      |  19 +-
 Docs/Chm/help/v2/setup.html                        |   6 +-
 Docs/Chm/help/v2/xml_replace.html                  |  49 +++++
 Docs/Chm/help/v2_dev/plg_index.html                |  37 +++-
 Docs/History.txt                                   |  30 +++
 Ext/KeePass.exe.config                             |   4 +-
 Ext/KeePass.iss                                    |  13 +-
 Ext/KeePassMsi/KeePassMsi.vdproj                   | 101 +++++-----
 KeePass/App/AppDefs.cs                             |  28 ++-
 KeePass/App/Configuration/AceMainWindow.cs         |   8 +
 KeePass/App/Configuration/AceSecurity.cs           |   8 +
 KeePass/App/Configuration/AceUI.cs                 |   1 +
 KeePass/DataExchange/Formats/KeePassKdb1x.cs       |   2 +-
 KeePass/DataExchange/Formats/StickyPwXml50.cs      |   2 +-
 KeePass/Forms/MainForm.cs                          |  48 ++++-
 KeePass/Forms/MainForm_Functions.cs                |  25 ++-
 KeePass/Forms/OptionsForm.cs                       |  14 +-
 KeePass/Forms/PrintForm.cs                         |  14 +-
 KeePass/Plugins/PluginManager.cs                   |  60 ++++--
 KeePass/Program.cs                                 |   8 +-
 KeePass/Properties/AssemblyInfo.cs                 |   4 +-
 KeePass/Resources/KPRes.Generated.cs               |  40 +++-
 KeePass/Util/TempFilesPool.cs                      | 219 +++++++++++++++++++--
 KeePass/Util/UpdateCheckEx.cs                      |  79 +++++++-
 .../Util/XmlSerialization/XmlSerializerEx.Gen.cs   |   6 +
 KeePassLib/Properties/AssemblyInfo.cs              |   4 +-
 KeePassLib/PwDefs.cs                               |   9 +-
 KeePassLib/Utility/AppLogEx.cs                     |   3 +-
 ShInstUtil/ShInstUtil.rc                           |   8 +-
 Translation/DefaultText.xml                        |  10 +-
 Translation/TrlUtil/Properties/AssemblyInfo.cs     |   4 +-
 39 files changed, 798 insertions(+), 216 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/keepass2.git