[Pkg-cli-apps-commits] [keepass2] 01/04: Merge tag 'upstream/2.33+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 a67f816168b98b5a99d612b50c78d62d7628da48
Merge: 4c9b5ac f4d5b7c
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Wed May 11 20:46:01 2016 +0200

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

 Build/KeePassLib_Distrib/KeePassLib.xml            |  22 +-
 Docs/Chm/help/base/placeholders.html               |  11 +-
 Docs/Chm/help/base/pwgenerator.html                |  10 +-
 Docs/Chm/help/v2/plugins.html                      |  22 +-
 Docs/Chm/help/v2/triggers.html                     |  10 +-
 Docs/Chm/help/v2_dev/customize.html                |   4 +
 Docs/Chm/help/v2_dev/scr_sc_index.html             |   5 +
 Docs/History.txt                                   |  49 ++
 Ext/Images_App_HighRes/Nuvola/B48x48_Folder.png    | Bin 0 -> 4789 bytes
 Ext/KeePass.exe.config                             |   4 +-
 Ext/KeePass.iss                                    |  10 +-
 Ext/KeePassMsi/KeePassMsi.vdproj                   |  14 +-
 KeePass/App/Configuration/AceApplication.cs        |   8 +
 KeePass/App/Configuration/AceMainWindow.cs         |   8 +
 KeePass/App/Configuration/AceSecurity.cs           |   8 +
 KeePass/App/Configuration/AppConfigEx.cs           |   5 +
 KeePass/DataExchange/Formats/KeePassXml2x.cs       |   2 +-
 KeePass/DataExchange/Formats/PpKeeperHtml270.cs    |   2 +
 KeePass/Ecas/EcasDefaultActionProvider.cs          |  43 +-
 KeePass/Forms/DataEditorForm.cs                    |   6 +-
 KeePass/Forms/DataViewerForm.cs                    |   6 +-
 KeePass/Forms/DatabaseOperationsForm.Designer.cs   |   6 +-
 KeePass/Forms/EditAutoTypeItemForm.cs              |   4 +-
 KeePass/Forms/MainForm.Designer.cs                 |  44 +-
 KeePass/Forms/MainForm.cs                          |  59 +-
 KeePass/Forms/MainForm.resx                        |   3 +
 KeePass/Forms/MainForm_Events.cs                   |   2 +
 KeePass/Forms/MainForm_Functions.cs                |  28 +-
 KeePass/Forms/OptionsForm.cs                       |   4 +
 KeePass/Forms/PrintForm.cs                         |  39 +-
 KeePass/Forms/PwEntryForm.cs                       |   7 +-
 KeePass/Forms/StatusProgressForm.cs                |   6 +
 KeePass/KeePass.csproj                             |   1 +
 KeePass/Native/NativeMethods.Defs.cs               |  16 +-
 KeePass/Native/NativeMethods.New.cs                |   7 +
 KeePass/Native/NativeMethods.cs                    |   4 +
 KeePass/Program.cs                                 |   7 +-
 KeePass/Properties/AssemblyInfo.cs                 |   4 +-
 KeePass/Properties/Resources.Designer.cs           |   9 +-
 KeePass/Properties/Resources.resx                  |   3 +
 KeePass/Resources/Data/Images_App_HighRes.bin      | Bin 340550 -> 345364 bytes
 KeePass/Resources/KPRes.Generated.cs               |  66 +-
 KeePass/Resources/Nuvola/B16x16_Folder.png         | Bin 0 -> 403 bytes
 KeePass/UI/CustomContextMenuStripEx.cs             |   6 +
 KeePass/UI/CustomMenuStripEx.cs                    |   6 +
 KeePass/UI/CustomTreeViewEx.cs                     |  26 +
 KeePass/UI/DpiUtil.cs                              |  16 +-
 KeePass/UI/OpenWithMenu.cs                         |  33 +-
 KeePass/UI/PwInputControlGroup.cs                  |  92 ++-
 KeePass/UI/UIUtil.cs                               |  21 +
 KeePass/Util/CriticalSectionEx.cs                  |   8 +-
 KeePass/Util/PwGeneratorUtil.cs                    |  10 +-
 KeePass/Util/Spr/SprEngine.cs                      |  71 ++-
 .../Util/XmlSerialization/XmlSerializerEx.Gen.cs   |   9 +
 KeePassLib/Collections/PwObjectPool.cs             | 151 +++++
 KeePassLib/Cryptography/SelfTest.cs                |   8 +-
 KeePassLib/Native/NativeLib.cs                     |  12 +-
 KeePassLib/Native/NativeMethods.cs                 |  59 +-
 KeePassLib/Properties/AssemblyInfo.cs              |   4 +-
 KeePassLib/PwDatabase.cs                           | 673 ++++++++++++---------
 KeePassLib/PwDefs.cs                               |   6 +-
 KeePassLib/PwEntry.cs                              |   8 +
 KeePassLib/PwGroup.cs                              |  10 +-
 KeePassLib/Serialization/FileTransactionEx.cs      |  15 +
 KeePassLib/Serialization/KdbxFile.Read.cs          |   6 +
 KeePassLib/Utility/StrUtil.cs                      | 117 +++-
 KeePassLib/Utility/UrlUtil.cs                      |   6 +-
 ShInstUtil/ShInstUtil.rc                           |   8 +-
 Translation/DefaultText.xml                        |  16 +-
 Translation/TrlUtil/Properties/AssemblyInfo.cs     |   4 +-
 70 files changed, 1441 insertions(+), 528 deletions(-)

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