[Pkg-cli-apps-commits] [keepass2] 02/05: Merge tag 'upstream/2.30' into dfsg_clean

[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 f4d84c9f03832cf19638958a29df90512bc3b97e
Merge: 99bc4e5 aa098f2
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Mon Aug 24 23:53:24 2015 +0200

    Merge tag 'upstream/2.30' into dfsg_clean
    
    Upstream version 2.30
    
    Conflicts:
    	Build/KeePassLibSD_Distrib/KeePassLibSD.dll
    	Build/KeePassLib_Distrib/KeePassLib.dll

 Build/KeePassLib_Distrib/KeePassLib.xml            |  42 ++-----
 Docs/Chm/default.css                               |  18 ++-
 Docs/Chm/help/base/autourl.html                    |   4 +-
 Docs/Chm/help/base/disclaimer.html                 |  52 +++++++--
 Docs/Chm/help/base/faq_tech.html                   |   3 +-
 Docs/Chm/help/base/keys.html                       |   8 +-
 Docs/Chm/help/base/placeholders.html               |  58 +++++++++-
 Docs/Chm/help/base/security.html                   |  12 ++
 Docs/Chm/help/v2/setup.html                        |   4 +-
 Docs/Chm/help/v2/xml_replace.html                  |  22 ++++
 Docs/Chm/help/v2_dev/scr_sc_index.html             |  16 ++-
 Docs/History.txt                                   |  62 ++++++++++
 Ext/KeePass.exe.config                             |   4 +-
 Ext/KeePass.iss                                    |  11 +-
 Ext/KeePassMsi/KeePassMsi.vdproj                   |  14 +--
 KeePass/App/Configuration/AceIntegration.cs        |   5 +
 KeePass/DataExchange/CsvStreamReaderEx.cs          |   6 +-
 KeePass/DataExchange/Formats/LastPassCsv2.cs       |   2 +-
 KeePass/DataExchange/Formats/RoboFormHtml69.cs     |   2 +-
 KeePass/DataExchange/Formats/XslTransform2x.cs     |  24 +++-
 KeePass/DataExchange/ImportUtil.cs                 |   3 +-
 KeePass/DataExchange/KdbManager.cs                 |  32 +++++-
 KeePass/DataExchange/PwExportInfo.cs               |   9 +-
 KeePass/Forms/EditStringForm.cs                    | 126 ++++++++++++---------
 KeePass/Forms/MainForm.cs                          |  16 +--
 KeePass/Forms/MainForm_Functions.cs                |  79 +++++++++++--
 KeePass/Forms/OptionsForm.Designer.cs              |   1 -
 KeePass/Forms/OptionsForm.cs                       |  33 +++++-
 KeePass/Forms/PwEntryForm.cs                       |   6 +-
 KeePass/Plugins/IPluginHost.cs                     |   2 +-
 KeePass/Properties/AssemblyInfo.cs                 |   4 +-
 KeePass/Resources/KPRes.Generated.cs               |  26 +++++
 KeePass/UI/CustomRichTextBoxEx.cs                  |  26 +++++
 KeePass/UI/MruList.cs                              |  12 +-
 KeePass/UI/OpenWithMenu.cs                         |  70 ++++++++++--
 KeePass/UI/UIUtil.cs                               |  43 +++++++
 KeePass/Util/AppLocator.cs                         |  60 ++++++++++
 KeePass/Util/AutoType.cs                           |  38 +++++--
 KeePass/Util/CommandLineArgs.cs                    |   7 +-
 .../Collections/ProtectedStringDictionary.cs       |   9 +-
 KeePassLib/Cryptography/CryptoRandom.cs            |  21 +++-
 KeePassLib/Cryptography/HmacOtp.cs                 |   2 +-
 KeePassLib/Keys/CompositeKey.cs                    |  42 ++++---
 KeePassLib/Native/NativeLib.cs                     |  23 +++-
 KeePassLib/Properties/AssemblyInfo.cs              |   4 +-
 KeePassLib/PwDefs.cs                               |   6 +-
 KeePassLib/Security/ProtectedBinary.cs             |   3 +-
 KeePassLib/Security/ProtectedString.cs             |   6 +-
 KeePassLib/Serialization/KdbxFile.Read.Streamed.cs |  14 ++-
 KeePassLib/Utility/GfxUtil.cs                      |   2 +-
 KeePassLib/Utility/MemUtil.cs                      |  55 ++++-----
 KeePassLib/Utility/MessageService.cs               |  26 +++--
 KeePassLib/Utility/MonoWorkarounds.cs              |  10 ++
 KeePassLib/Utility/StrUtil.cs                      |   4 +-
 KeePassLibSD/Properties/AssemblyInfo.cs            |   2 +-
 ShInstUtil/ShInstUtil.rc                           |   8 +-
 Translation/DefaultText.xml                        |   6 +
 Translation/TrlUtil/Properties/AssemblyInfo.cs     |   4 +-
 58 files changed, 921 insertions(+), 288 deletions(-)

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