[Pkg-cli-apps-commits] [keepass2] 01/01: Merge tag 'upstream/2.27' into dfsg_clean
Julian Taylor
jtaylor.debian at googlemail.com
Sun Aug 17 15:07:34 UTC 2014
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 2af6f9b6b4a9e979aab81b805ffc70f1153a72e5
Merge: a077374 79cc66c
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Aug 17 15:41:55 2014 +0200
Merge tag 'upstream/2.27' into dfsg_clean
Upstream version 2.27
Conflicts:
Build/KeePassLibSD_Distrib/KeePassLibSD.dll
Build/KeePassLib_Distrib/KeePassLib.dll
Build/KeePassLib_Distrib/KeePassLib.xml | 16 +-
Docs/Chm/help/base/autotype.html | 2 +
Docs/Chm/help/base/autourl.html | 2 +-
Docs/Chm/help/base/configuration.html | 8 +-
Docs/Chm/help/base/credits.html | 4 +-
Docs/Chm/help/base/placeholders.html | 55 +-
Docs/Chm/help/base/pwgenerator.html | 6 +-
Docs/Chm/help/base/security.html | 27 +-
Docs/Chm/help/v2/setup.html | 5 +
Docs/Chm/help/v2/xml_replace.html | 59 +-
Docs/Chm/help/v2_dev/customize.html | 14 +
Docs/History.txt | 107 +
Ext/KeePass.exe.config | 4 +-
Ext/KeePass.iss | 10 +-
Ext/KeePassMsi/KeePassMsi.vdproj | 14 +-
KeePass/App/AppDefs.cs | 5 +
KeePass/App/Configuration/AceApplication.cs | 8 +
KeePass/App/Configuration/AceIntegration.cs | 28 +-
KeePass/App/Configuration/AceUI.cs | 1 +
KeePass/DataExchange/KdbManager.cs | 4 -
KeePass/Ecas/EcasDefaultActionProvider.cs | 24 +-
KeePass/Forms/AutoTypeCtxForm.cs | 12 +-
KeePass/Forms/ColumnsForm.cs | 48 +-
KeePass/Forms/DataEditorForm.Designer.cs | 6 +-
KeePass/Forms/EditAutoTypeItemForm.Designer.cs | 84 +-
KeePass/Forms/EditAutoTypeItemForm.cs | 20 +-
KeePass/Forms/EntropyForm.Designer.cs | 6 +-
KeePass/Forms/EntropyForm.cs | 2 +-
KeePass/Forms/IconPickerForm.cs | 2 +-
KeePass/Forms/KeyCreationForm.Designer.cs | 25 +-
KeePass/Forms/KeyCreationForm.cs | 2 +-
KeePass/Forms/KeyPromptForm.cs | 29 +-
KeePass/Forms/MainForm.Designer.cs | 53 +-
KeePass/Forms/MainForm.cs | 216 +-
KeePass/Forms/MainForm.resx | 2782 ++++++++++----------
KeePass/Forms/MainForm_Functions.cs | 340 ++-
KeePass/Forms/OptionsForm.Designer.cs | 36 +-
KeePass/Forms/OptionsForm.cs | 44 +-
KeePass/Forms/PwEntryForm.Designer.cs | 39 +-
KeePass/Forms/PwEntryForm.cs | 116 +-
...orm.Designer.cs => UrlOverrideForm.Designer.cs} | 6 +-
.../Forms/{UrlSchemeForm.cs => UrlOverrideForm.cs} | 6 +-
.../{UrlSchemeForm.resx => UrlOverrideForm.resx} | 0
...rm.Designer.cs => UrlOverridesForm.Designer.cs} | 41 +-
.../{UrlSchemesForm.cs => UrlOverridesForm.cs} | 62 +-
.../{UrlSchemesForm.resx => UrlOverridesForm.resx} | 0
KeePass/KeePass.csproj | 29 +-
KeePass/Native/NativeMethods.New.cs | 16 +
KeePass/Native/NativeMethods.Unix.cs | 88 +-
KeePass/Native/NativeMethods.cs | 9 +
KeePass/Program.cs | 52 +
KeePass/Properties/AssemblyInfo.cs | 4 +-
KeePass/Resources/KPRes.Generated.cs | 169 +-
KeePass/UI/CustomListViewEx.cs | 3 +-
KeePass/UI/CustomRichTextBoxEx.cs | 271 +-
KeePass/UI/CustomToolStripRendererEx.cs | 3 +-
KeePass/UI/GlobalWindowManager.cs | 5 -
KeePass/UI/ImageComboBoxEx.cs | 4 +-
KeePass/UI/ProtectedDialog.cs | 20 +
KeePass/UI/PwInputControlGroup.cs | 44 +-
KeePass/UI/QualityProgressBar.cs | 129 +-
KeePass/UI/RichTextBuilder.cs | 2 -
KeePass/UI/SecureEdit.cs | 2 -
KeePass/UI/SplitButtonEx.cs | 4 +-
KeePass/UI/ThemeToolStripRenderer.cs | 228 +-
KeePass/UI/UISystemFonts.cs | 73 +-
KeePass/UI/UIUtil.cs | 51 +-
KeePass/Util/AutoType.cs | 17 +-
KeePass/Util/ClipboardUtil.Unix.cs | 24 +-
KeePass/Util/ClipboardUtil.cs | 8 +-
KeePass/Util/EntryUtil.cs | 130 +-
KeePass/Util/HotKeyManager.cs | 13 +
KeePass/Util/IpcUtilEx.cs | 44 +
KeePass/Util/SendInputEx.cs | 106 +-
KeePass/Util/SendInputExt/SiEngineUnix.cs | 31 +-
KeePass/Util/SendInputExt/SiEngineWin.cs | 20 +-
KeePass/Util/SendInputExt/SiObf.cs | 8 +-
KeePass/Util/ShutdownBlocker.cs | 92 +
KeePass/Util/Spr/SprContext.cs | 26 +-
KeePass/Util/Spr/SprEngine.cs | 120 +-
KeePass/Util/Spr/SprSyntax.cs | 358 +++
KeePass/Util/WinUtil.cs | 36 +-
.../Util/XmlSerialization/XmlSerializerEx.Gen.cs | 3 +
KeePassLib/Cryptography/CryptoRandom.cs | 5 +-
.../PasswordGenerator/PatternBasedGenerator.cs | 11 +
.../Cryptography/PasswordGenerator/PwCharSet.cs | 2 +
KeePassLib/Cryptography/SelfTest.cs | 34 +-
KeePassLib/KeePassLib.csproj | 2 +
KeePassLib/Native/NativeLib.cs | 38 +
KeePassLib/Native/NativeMethods.Unix.cs | 112 +
KeePassLib/Native/NativeMethods.cs | 23 +-
KeePassLib/Properties/AssemblyInfo.cs | 4 +-
KeePassLib/PwDatabase.cs | 89 +-
KeePassLib/PwDefs.cs | 14 +-
KeePassLib/PwGroup.cs | 43 +-
KeePassLib/Serialization/IOConnection.cs | 183 +-
KeePassLib/Serialization/IOConnectionInfo.cs | 10 +-
KeePassLib/Utility/MemUtil.cs | 57 +
.../Util => KeePassLib/Utility}/MonoWorkarounds.cs | 68 +-
KeePassLib/Utility/StrUtil.cs | 34 +
KeePassLibSD/KeePassLibSD.csproj | 6 +
KeePassLibSD/Properties/AssemblyInfo.cs | 2 +-
ShInstUtil/ShInstUtil.rc | 8 +-
Translation/DefaultText.xml | 39 +-
Translation/TrlUtil/FormTrlMgr.cs | 4 +-
Translation/TrlUtil/Properties/AssemblyInfo.cs | 4 +-
106 files changed, 4867 insertions(+), 2547 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