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

Julian Taylor jtaylor.debian at googlemail.com
Fri Oct 17 18:28:54 UTC 2014


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

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

commit df9ef3717e339f4b9d437540decaf2e39d0ea1a4
Merge: 3f26bba 1b7e5ba
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Fri Oct 17 19:48:36 2014 +0200

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

 Build/KeePassLib_Distrib/KeePassLib.xml            |   36 +-
 Docs/Chm/help/base/autotype.html                   |    7 +
 Docs/Chm/help/base/importexport.html               |   22 +-
 Docs/Chm/help/base/security.html                   |   14 +-
 Docs/Chm/help/base/usingpws.html                   |    2 +-
 Docs/Chm/help/v2/setup.html                        |   19 +-
 Docs/Chm/help/v2/triggers.html                     |   31 +-
 Docs/Chm/help/v2/version.html                      |    8 +-
 Docs/Chm/help/v2_dev/scr_sc_index.html             |   12 +
 Docs/History.txt                                   |   91 +
 Ext/KeePass.exe.config                             |    7 +-
 Ext/KeePass.iss                                    |   10 +-
 Ext/KeePassMsi/KeePassMsi.vdproj                   |   14 +-
 KeePass/App/AppPolicy.cs                           |    2 +-
 KeePass/DataExchange/FileFormatPool.cs             |    1 +
 KeePass/DataExchange/Formats/VisKeeperTxt3.cs      |  143 +
 KeePass/DataExchange/ImportUtil.cs                 |   14 +-
 KeePass/DataExchange/KdbFile.cs                    |   98 +-
 KeePass/DataExchange/KdbManager.cs                 |   39 +-
 KeePass/Ecas/EcasContext.cs                        |   17 +-
 KeePass/Ecas/EcasDefaultActionProvider.cs          |  177 +-
 KeePass/Ecas/EcasDefaultConditionProvider.cs       |   21 +-
 KeePass/Ecas/EcasDefaultEventProvider.cs           |   46 +-
 KeePass/Ecas/EcasPropertyDictionary.cs             |   69 +
 KeePass/Ecas/EcasSystemEvents.cs                   |    9 +-
 KeePass/Ecas/EcasTrigger.cs                        |    9 +-
 KeePass/Ecas/EcasTriggerSystem.cs                  |   31 +-
 KeePass/Forms/AboutForm.cs                         |    6 +-
 KeePass/Forms/AutoTypeCtxForm.cs                   |   26 +-
 KeePass/Forms/CharPickerForm.Designer.cs           |   37 +-
 KeePass/Forms/CharPickerForm.cs                    |   38 +-
 KeePass/Forms/ColumnsForm.cs                       |   10 +-
 KeePass/Forms/CsvImportForm.cs                     |    7 +-
 KeePass/Forms/DataEditorForm.Designer.cs           |   12 +-
 KeePass/Forms/DataEditorForm.cs                    |    2 +-
 KeePass/Forms/DataViewerForm.cs                    |    6 +-
 KeePass/Forms/DatabaseSettingsForm.cs              |   10 +-
 KeePass/Forms/EcasTriggerForm.cs                   |   32 +
 KeePass/Forms/EcasTriggersForm.Designer.cs         |    4 +-
 KeePass/Forms/EcasTriggersForm.cs                  |    4 +
 KeePass/Forms/EntropyForm.Designer.cs              |   16 +-
 KeePass/Forms/EntropyForm.cs                       |   72 +
 KeePass/Forms/EntryListForm.cs                     |    4 +-
 KeePass/Forms/EntryReportForm.cs                   |    9 +-
 KeePass/Forms/ExchangeDataForm.cs                  |    9 +-
 KeePass/Forms/FileBrowserForm.cs                   |    4 +-
 KeePass/Forms/IconPickerForm.cs                    |    3 +-
 KeePass/Forms/KeyCreationForm.Designer.cs          |    3 +-
 KeePass/Forms/KeyCreationForm.cs                   |    4 +-
 KeePass/Forms/KeyPromptForm.Designer.cs            |    3 +-
 KeePass/Forms/KeyPromptForm.cs                     |   12 +-
 KeePass/Forms/LanguageForm.Designer.cs             |   13 +-
 KeePass/Forms/LanguageForm.cs                      |   29 +-
 KeePass/Forms/LanguageForm.resx                    |   40 -
 KeePass/Forms/MainForm.Designer.cs                 |   26 +-
 KeePass/Forms/MainForm.cs                          |  138 +-
 KeePass/Forms/MainForm.resx                        | 2885 ++++++++++----------
 KeePass/Forms/MainForm_Functions.cs                |  216 +-
 KeePass/Forms/OptionsForm.cs                       |   19 +-
 KeePass/Forms/PluginsForm.cs                       |   17 +-
 KeePass/Forms/PrintForm.Designer.cs                |   36 +-
 KeePass/Forms/PrintForm.cs                         |   21 +
 KeePass/Forms/PrintForm.resx                       |   45 -
 KeePass/Forms/PwEntryForm.Designer.cs              |   57 +-
 KeePass/Forms/PwEntryForm.cs                       |  196 +-
 KeePass/Forms/PwGeneratorForm.cs                   |    7 +-
 KeePass/Forms/StatusLoggerForm.Designer.cs         |   16 +-
 KeePass/Forms/StatusLoggerForm.cs                  |   30 +-
 KeePass/Forms/StatusLoggerForm.resx                |   82 -
 KeePass/Forms/UpdateCheckForm.cs                   |   14 +-
 KeePass/Forms/UrlOverridesForm.cs                  |   30 +-
 KeePass/Forms/XmlReplaceForm.Designer.cs           |    1 +
 KeePass/KeePass.csproj                             |   18 +-
 KeePass/Native/NativeMethods.Defs.cs               |   21 +-
 KeePass/Native/NativeMethods.New.cs                |   51 +-
 KeePass/Native/NativeMethods.cs                    |   21 +-
 KeePass/Program.cs                                 |    7 +
 KeePass/Properties/AssemblyInfo.cs                 |    4 +-
 KeePass/Properties/Resources.Designer.cs           |   55 +-
 KeePass/Properties/Resources.resx                  |   27 +-
 KeePass/Resources/Images/B16x16_MenuCheck.png      |  Bin 0 -> 255 bytes
 KeePass/Resources/Images/B16x16_MenuRadio.png      |  Bin 342 -> 364 bytes
 KeePass/Resources/Images/B16x16_Transparent.png    |  Bin 0 -> 122 bytes
 KeePass/Resources/Images/B17x05_3BlackDots.png     |  Bin 92 -> 0 bytes
 KeePass/Resources/Images/B19x07_3BlackDots.png     |  Bin 0 -> 104 bytes
 KeePass/Resources/Images/B284x231_Random.png       |  Bin 25186 -> 0 bytes
 KeePass/Resources/KPRes.Generated.cs               |  261 +-
 KeePass/Resources/Nuvola/B16x16_FTP.png            |  Bin 1173 -> 955 bytes
 KeePass/Resources/Nuvola/B16x16_Help.png           |  Bin 1187 -> 934 bytes
 .../B16x16_MessageBox_Critical.png                 |  Bin
 .../B16x16_MessageBox_Warning.png                  |  Bin
 KeePass/Resources/Nuvola/B16x16_XMag.png           |  Bin 1000 -> 714 bytes
 KeePass/Resources/Nuvola_IL/B16x16_Message.png     |  Bin 988 -> 0 bytes
 KeePass/UI/BackgroundForm.cs                       |    4 +-
 KeePass/UI/BannerFactory.cs                        |   82 +-
 .../UI/CustomContextMenuStripEx.cs                 |   31 +-
 KeePass/UI/CustomListViewEx.cs                     |   11 +-
 KeePass/UI/CustomMenuStripEx.cs                    |    2 +
 KeePass/UI/CustomRichTextBoxEx.cs                  |    4 +
 KeePass/UI/CustomToolStripEx.cs                    |   49 +
 KeePass/UI/CustomToolStripRendererEx.cs            |  139 +-
 KeePass/UI/CustomTreeViewEx.cs                     |   60 +-
 KeePass/UI/DpiUtil.cs                              |  262 ++
 KeePass/UI/DwmUtil.cs                              |  173 +-
 KeePass/UI/ListSorter.cs                           |    2 +-
 KeePass/UI/OpenWithMenu.cs                         |    3 +-
 KeePass/UI/ProtectedDialog.cs                      |   59 +-
 KeePass/UI/PwInputControlGroup.cs                  |   39 +
 KeePass/UI/QualityProgressBar.cs                   |   25 +-
 KeePass/UI/RichTextBoxContextMenu.cs               |    2 +-
 KeePass/UI/SecureEdit.cs                           |  199 +-
 KeePass/UI/UIUtil.cs                               |  618 ++++-
 KeePass/UI/VistaTaskDialog.cs                      |   12 +
 KeePass/Util/ClipboardEventChainBlocker.cs         |   22 +-
 KeePass/Util/ClipboardUtil.cs                      |    3 +-
 KeePass/Util/CustomResourceManager.cs              |  178 ++
 KeePass/Util/EntryMenu.cs                          |    2 +-
 KeePass/Util/EntryTemplates.cs                     |    4 +-
 KeePass/Util/EntryUtil.cs                          |   12 +-
 KeePass/Util/SendInputEx.cs                        |   18 +-
 KeePass/Util/SendInputExt/SiCodes.cs               |    8 +-
 KeePass/Util/SendInputExt/SiEngineWin.cs           |   36 +-
 KeePass/Util/UpdateCheckEx.cs                      |    4 +
 KeePassLib/Collections/AutoTypeConfig.cs           |   32 +-
 KeePassLib/Collections/PwObjectList.cs             |   64 +-
 KeePassLib/Cryptography/Cipher/Salsa20Cipher.cs    |   15 +-
 KeePassLib/Cryptography/CryptoRandomStream.cs      |    2 +-
 KeePassLib/Cryptography/SelfTest.cs                |   52 +-
 KeePassLib/Properties/AssemblyInfo.cs              |    4 +-
 KeePassLib/PwDatabase.cs                           |   32 +-
 KeePassLib/PwDefs.cs                               |    6 +-
 KeePassLib/PwEntry.cs                              |   18 +
 KeePassLib/PwGroup.cs                              |   40 +
 KeePassLib/Security/ProtectedBinary.cs             |  227 +-
 KeePassLib/Security/ProtectedString.cs             |  113 +-
 KeePassLib/Serialization/IOConnection.cs           |    3 +-
 KeePassLib/Serialization/IOConnectionInfo.cs       |    2 +-
 KeePassLib/Utility/MemUtil.cs                      |    3 +-
 KeePassLib/Utility/MessageService.cs               |    2 +-
 KeePassLib/Utility/TimeUtil.cs                     |  115 +-
 KeePassLib/Utility/UrlUtil.cs                      |   11 +-
 KeePassLibSD/Properties/AssemblyInfo.cs            |    2 +-
 KeePassLibSD/SecureStringEx.cs                     |    1 +
 ShInstUtil/ShInstUtil.rc                           |    8 +-
 Translation/DefaultText.xml                        |   61 +-
 Translation/TrlUtil/Properties/AssemblyInfo.cs     |    4 +-
 146 files changed, 5879 insertions(+), 2666 deletions(-)

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



More information about the Pkg-cli-apps-commits mailing list