[Pkg-cli-apps-commits] [keepass2] 01/02: Merge tag 'upstream/2.26+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 82a2fde83ff15004c191463d640caaa599c6999b
Merge: 28ca44f a077374
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Sun Apr 27 19:31:29 2014 +0200

    Merge tag 'upstream/2.26+dfsg'
    
    Dfsg upstream version 2.26

 Build/KeePassLib_Distrib/KeePassLib.xml            |    9 +-
 Build/MakeDistribDebug.bat                         |   38 -
 Build/MakeDistribRelease.bat                       |   39 -
 Build/SnKeys_UseDummy.bat                          |   16 -
 Build/SnKeys_UsePrivate.bat                        |   16 -
 Docs/Chm/KeePass.hhp                               |    1 -
 Docs/Chm/help/base/credits.html                    |  383 ++-
 Docs/Chm/help/base/credits_icons_license.html      |  110 -
 Docs/Chm/help/base/faq_tech.html                   |    2 +-
 Docs/Chm/help/base/placeholders.html               |    4 +-
 Docs/Chm/help/base/security.html                   |    2 +-
 Docs/Chm/help/v2/autotype_obfuscation.html         |    8 +-
 Docs/Chm/help/v2/license.html                      |   54 +-
 Docs/Chm/help/v2/setup.html                        |    7 +-
 Docs/Chm/help/v2/triggers.html                     |    7 +
 Docs/Chm/help/v2/xml_replace.html                  |   69 +
 Docs/Chm/help/v2_dev/customize.html                |   19 +-
 Docs/Chm/help/v2_dev/scr_sc_index.html             |   37 +-
 Docs/History.txt                                   |   67 +-
 Docs/License.txt                                   |   48 +-
 Docs/License_Install.txt                           |  345 ---
 Ext/Icons/ReadMe.txt                               |    4 +-
 Ext/Icons_Nuvola/License.txt                       |  504 ++++
 Ext/Icons_Nuvola/ReadMe.txt                        |   60 +
 Ext/KeePass.exe.config                             |    4 +-
 Ext/KeePass.iss                                    |   12 +-
 Ext/KeePassMsi/KeePassMsi.vdproj                   |   18 +-
 KeePass/App/Configuration/AceIntegration.cs        |    8 +
 KeePass/App/Configuration/AceUI.cs                 |    9 +
 KeePass/DataExchange/Formats/KeePassKdb2xRepair.cs |    2 +-
 KeePass/DataExchange/Formats/RoboFormHtml69.cs     |   16 +-
 KeePass/DataExchange/ImportUtil.cs                 |   15 +-
 KeePass/Ecas/EcasDefaultActionProvider.cs          |   17 +-
 KeePass/Forms/AutoTypeCtxForm.cs                   |    6 +
 KeePass/Forms/ColumnsForm.cs                       |   11 +-
 KeePass/Forms/DataEditorForm.cs                    |   54 +-
 KeePass/Forms/KeyPromptForm.cs                     |  138 +-
 KeePass/Forms/MainForm.Designer.cs                 |   50 +-
 KeePass/Forms/MainForm.cs                          |   41 +-
 KeePass/Forms/MainForm.resx                        | 2820 ++++++++++----------
 KeePass/Forms/MainForm_Functions.cs                |  188 +-
 KeePass/Forms/OptionsForm.cs                       |   12 +-
 KeePass/Forms/PwEntryForm.cs                       |    4 +-
 KeePass/Forms/UpdateCheckForm.cs                   |    5 +-
 KeePass/Native/NativeMethods.Unix.cs               |    7 +
 KeePass/Properties/AssemblyInfo.cs                 |    4 +-
 KeePass/Resources/KPRes.Generated.cs               |  117 +
 KeePass/UI/DocumentManagerEx.cs                    |   40 +-
 KeePass/UI/MruList.cs                              |  260 +-
 KeePass/UI/UIUtil.cs                               |   36 +
 KeePass/Util/AppLocator.cs                         |   33 +-
 KeePass/Util/SendInputEx.cs                        |   13 +-
 KeePass/Util/SendInputExt/SiEngineWin.cs           |   62 +-
 KeePass/Util/Spr/SprEngine.cs                      |    8 +-
 KeePass/Util/UpdateCheckEx.cs                      |   34 +-
 .../Util/XmlSerialization/XmlSerializerEx.Gen.cs   |    6 +
 KeePassLib/Cryptography/SelfTest.cs                |   10 +-
 KeePassLib/KeePassLib.csproj                       |    2 +
 KeePassLib/Native/NativeLib.cs                     |   26 +
 KeePassLib/Properties/AssemblyInfo.cs              |    4 +-
 KeePassLib/PwDatabase.cs                           |    4 -
 KeePassLib/PwDefs.cs                               |    6 +-
 KeePassLib/PwGroup.cs                              |    3 +
 KeePassLib/Utility/StrUtil.cs                      |   73 +-
 KeePassLibSD/Properties/AssemblyInfo.cs            |    2 +-
 ShInstUtil/ShInstUtil.rc                           |    8 +-
 Translation/DefaultText.xml                        |   27 +
 Translation/TrlUtil/Properties/AssemblyInfo.cs     |    4 +-
 68 files changed, 3580 insertions(+), 2488 deletions(-)

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