[Pkg-cli-apps-commits] [keepass2] 01/02: Merge tag 'upstream/2.24' into dfsg_clean
Julian Taylor
jtaylor.debian at googlemail.com
Sun Nov 3 19:22:10 UTC 2013
This is an automated email from the git hooks/post-receive script.
jtaylor-guest pushed a commit to branch dfsg_clean
in repository keepass2.
commit 7c2bf93500a17baabea728362351a1d0975c9fff
Merge: 3243299 743d0dd
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Nov 3 19:49:55 2013 +0100
Merge tag 'upstream/2.24' into dfsg_clean
Upstream version 2.24
Conflicts:
Build/KeePassLibSD_Distrib/KeePassLibSD.dll
Build/KeePassLib_Distrib/KeePassLib.dll
KeePass/Resources/Images/B16x16_Imp_AmP.png
KeePass/Resources/Images/B16x16_Imp_AnyPw.png
KeePass/Resources/Images/B16x16_Imp_CWallet.png
KeePass/Resources/Images/B16x16_Imp_DataVault.png
KeePass/Resources/Images/B16x16_Imp_DesktopKnox.png
KeePass/Resources/Images/B16x16_Imp_FlexWallet.png
KeePass/Resources/Images/B16x16_Imp_HandySafe.png
KeePass/Resources/Images/B16x16_Imp_HandySafePro.png
KeePass/Resources/Images/B16x16_Imp_KasperskyPwMgr.png
KeePass/Resources/Images/B16x16_Imp_LastPass.png
KeePass/Resources/Images/B16x16_Imp_NetworkPwMgr.png
KeePass/Resources/Images/B16x16_Imp_OnePwPro.png
KeePass/Resources/Images/B16x16_Imp_PINs.png
KeePass/Resources/Images/B16x16_Imp_PVault.png
KeePass/Resources/Images/B16x16_Imp_PassKeeper.png
KeePass/Resources/Images/B16x16_Imp_PwAgent.png
KeePass/Resources/Images/B16x16_Imp_PwDepot.png
KeePass/Resources/Images/B16x16_Imp_PwMem2008.png
KeePass/Resources/Images/B16x16_Imp_PwPrompter.png
KeePass/Resources/Images/B16x16_Imp_PwSafe.png
KeePass/Resources/Images/B16x16_Imp_PwTresor.png
KeePass/Resources/Images/B16x16_Imp_PwsPlus.png
KeePass/Resources/Images/B16x16_Imp_Revelation.png
KeePass/Resources/Images/B16x16_Imp_RoboForm.png
KeePass/Resources/Images/B16x16_Imp_SafeWallet.png
KeePass/Resources/Images/B16x16_Imp_Security.png
KeePass/Resources/Images/B16x16_Imp_SplashID.png
KeePass/Resources/Images/B16x16_Imp_Steganos.png
KeePass/Resources/Images/B16x16_Imp_StickyPw.png
KeePass/Resources/Images/B16x16_Imp_TurboPws.png
KeePass/Resources/Images/B16x16_Imp_Whisper32.png
KeePass/Resources/Images/B16x16_Imp_ZdnPwPro.png
Build/KeePassLib_Distrib/KeePassLib.xml | 36 +--
Docs/Chm/default.css | 4 +-
Docs/Chm/help/base/autotype.html | 4 +-
Docs/Chm/help/base/fieldrefs.html | 14 +-
Docs/Chm/help/base/importexport.html | 3 +-
Docs/Chm/help/base/keys.html | 57 +++--
Docs/Chm/help/base/placeholders.html | 2 +-
Docs/Chm/help/v2_dev/customize.html | 23 +-
Docs/History.txt | 67 ++++++
Ext/KeePass.exe.config | 4 +-
Ext/KeePass.iss | 10 +-
Ext/KeePassMsi/KeePassMsi.vdproj | 14 +-
KeePass/App/Configuration/AceCustomConfig.cs | 11 +-
KeePass/App/Configuration/AceUI.cs | 5 +-
KeePass/DataExchange/FileFormatPool.cs | 1 +
.../Formats/MozillaBookmarksJson100.cs | 91 +++++++-
.../DataExchange/Formats/NortonIdSafeCsv2013.cs | 90 ++++++++
KeePass/DataExchange/Formats/RoboFormHtml69.cs | 74 +++++-
KeePass/DataExchange/GxiImporter.cs | 10 +-
KeePass/DataExchange/Json.cs | 8 +-
KeePass/DataExchange/KdbFile.cs | 7 +-
KeePass/Ecas/EcasActionProvider.cs | 6 +-
KeePass/Ecas/EcasActionType.cs | 2 +-
KeePass/Ecas/EcasConditionProvider.cs | 6 +-
KeePass/Ecas/EcasConditionType.cs | 2 +-
KeePass/Ecas/EcasDefaultActionProvider.cs | 2 +-
KeePass/Ecas/EcasEventProvider.cs | 8 +-
KeePass/Ecas/EcasEventType.cs | 2 +-
KeePass/Ecas/EcasPool.cs | 2 +-
KeePass/Ecas/EcasTriggerSystem.cs | 8 +-
KeePass/Ecas/EcasUtil.cs | 4 +-
KeePass/Forms/ColumnsForm.cs | 2 +-
KeePass/Forms/CsvImportForm.cs | 53 +++--
KeePass/Forms/DataEditorForm.Designer.cs | 33 ++-
KeePass/Forms/DataEditorForm.cs | 8 +-
KeePass/Forms/DataEditorForm.resx | 8 -
KeePass/Forms/DatabaseSettingsForm.cs | 8 +-
KeePass/Forms/FileBrowserForm.cs | 18 +-
KeePass/Forms/GroupForm.cs | 4 +-
KeePass/Forms/IconPickerForm.cs | 4 +-
KeePass/Forms/InternalBrowserForm.cs | 3 +-
KeePass/Forms/KeyPromptForm.cs | 9 +-
KeePass/Forms/MainForm.cs | 31 +--
KeePass/Forms/MainForm_Functions.cs | 79 ++++---
KeePass/Forms/PrintForm.Designer.cs | 34 +--
KeePass/Forms/PrintForm.cs | 37 ++-
KeePass/Forms/PrintForm.resx | 64 +++---
KeePass/Forms/PwEntryForm.Designer.cs | 243 ++++++++++----------
KeePass/Forms/PwEntryForm.cs | 115 +++++++--
KeePass/KeePass.csproj | 4 +
KeePass/Native/NativeMethods.Defs.cs | 16 ++
KeePass/Native/NativeMethods.Structs.cs | 42 ++++
KeePass/Native/NativeMethods.cs | 49 +++-
KeePass/Program.cs | 5 +
KeePass/Properties/AssemblyInfo.cs | 4 +-
KeePass/Properties/Resources.Designer.cs | 9 +-
KeePass/Properties/Resources.resx | 3 +
KeePass/Resources/Images/B16x16_FontBold.png | Bin 207 -> 156 bytes
KeePass/Resources/Images/B16x16_FontItalic.png | Bin 208 -> 155 bytes
KeePass/Resources/Images/B16x16_FontStrikeout.png | Bin 159 -> 120 bytes
KeePass/Resources/Images/B16x16_FontUnderline.png | Bin 142 -> 107 bytes
KeePass/Resources/Images/B16x16_Imp_KeePassX.png | Bin 856 -> 853 bytes
.../Resources/Images/B16x16_Imp_NortonIdSafe.png | Bin 0 -> 722 bytes
KeePass/Resources/Images/B16x16_KeePass.png | Bin 772 -> 774 bytes
KeePass/Resources/Images/B16x16_LockWorkspace.png | Bin 574 -> 591 bytes
KeePass/Resources/Images/B16x16_MenuRadio.png | Bin 329 -> 342 bytes
.../Resources/Images/B16x16_TextAlignCenter.png | Bin 341 -> 347 bytes
KeePass/Resources/Images/B16x16_TextAlignLeft.png | Bin 343 -> 349 bytes
KeePass/Resources/Images/B16x16_TextAlignRight.png | Bin 346 -> 355 bytes
KeePass/Resources/Images/B16x16_WinFavs.png | Bin 561 -> 589 bytes
KeePass/Resources/Images/B17x05_3BlackDots.png | Bin 121 -> 92 bytes
KeePass/Resources/Images/B284x231_Random.png | Bin 25720 -> 25186 bytes
.../Nuvola_Derived/B16x16_EditCopyUrl.png | Bin 644 -> 673 bytes
.../Resources/Nuvola_Derived/B16x16_Folder_2.png | Bin 622 -> 650 bytes
KeePass/UI/CustomListViewEx.cs | 2 +-
KeePass/UI/CustomRichTextBoxEx.cs | 28 ++-
KeePass/UI/EnableThemingInScope.cs | 141 ++++++++++++
KeePass/UI/FileDialogsEx.cs | 2 +-
KeePass/UI/OpenWithMenu.cs | 19 +-
KeePass/UI/ProtectedDialog.cs | 23 +-
KeePass/UI/PwInputControlGroup.cs | 106 ++++++++-
KeePass/UI/UIUtil.cs | 70 +++++-
KeePass/UI/VistaTaskDialog.cs | 60 ++++-
KeePass/Util/AppLocator.cs | 40 +++-
KeePass/Util/BinaryDataClassifier.cs | 9 +-
KeePass/Util/ChildProcessesSnapshot.cs | 195 ++++++++++++++++
KeePass/Util/ClipboardUtil.Unix.cs | 14 +-
KeePass/Util/ClipboardUtil.cs | 4 +-
KeePass/Util/EntryMenu.cs | 2 +-
KeePass/Util/EntryTemplates.cs | 25 +-
KeePass/Util/SendInputEx.Windows.cs | 19 +-
KeePassLib/Collections/PwObjectPool.cs | 14 +-
KeePassLib/Cryptography/Cipher/CipherPool.cs | 6 +-
KeePassLib/Cryptography/CryptoRandom.cs | 16 +-
KeePassLib/Cryptography/HmacOtp.cs | 4 +-
.../PasswordGenerator/CustomPwGeneratorPool.cs | 4 +-
KeePassLib/Cryptography/QualityEstimation.cs | 6 +-
KeePassLib/Cryptography/SelfTest.cs | 23 +-
KeePassLib/Native/NativeLib.cs | 96 ++++++--
KeePassLib/Properties/AssemblyInfo.cs | 4 +-
KeePassLib/PwCustomIcon.cs | 4 +-
KeePassLib/PwDatabase.cs | 54 ++---
KeePassLib/PwDefs.cs | 10 +-
KeePassLib/PwEntry.cs | 6 +-
KeePassLib/PwEnums.cs | 18 ++
KeePassLib/PwGroup.cs | 8 +-
KeePassLib/PwUuid.cs | 126 ++++++----
KeePassLib/Serialization/IOConnection.cs | 2 +-
KeePassLib/Serialization/KdbxFile.Read.Streamed.cs | 19 +-
KeePassLib/Serialization/KdbxFile.Read.cs | 16 ++
KeePassLib/Serialization/KdbxFile.Write.cs | 12 +-
KeePassLib/Serialization/KdbxFile.cs | 7 +-
KeePassLib/Translation/KPControlCustomization.cs | 8 +-
KeePassLib/Utility/AppLogEx.cs | 2 +-
KeePassLib/Utility/MemUtil.cs | 92 ++++++++
KeePassLib/Utility/StrUtil.cs | 150 +++++++++---
KeePassLib/Utility/UrlUtil.cs | 23 +-
KeePassLibSD/Properties/AssemblyInfo.cs | 2 +-
ShInstUtil/ShInstUtil.rc | 8 +-
Translation/TrlUtil/MainForm.Designer.cs | 81 +++++--
Translation/TrlUtil/MainForm.cs | 154 ++++++++++---
Translation/TrlUtil/PreviewForm.cs | 4 +-
Translation/TrlUtil/Properties/AssemblyInfo.cs | 4 +-
.../TrlUtil/Properties/Resources.Designer.cs | 9 +-
Translation/TrlUtil/Properties/Resources.resx | 3 +
Translation/TrlUtil/Resources/B16x16_Down.png | Bin 0 -> 912 bytes
Translation/TrlUtil/TrlUtil.csproj | 3 +
127 files changed, 2439 insertions(+), 780 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