Merge branch 'develop' into release/2.9.15

This commit is contained in:
J-Jamet
2021-03-27 10:13:53 +01:00
4 changed files with 4 additions and 1 deletions

View File

@@ -2,6 +2,7 @@ KeePassDX(2.9.15)
* Fix themes #935 #926 * Fix themes #935 #926
* Decrease default clipboard time #934 * Decrease default clipboard time #934
* Better opening performance #929 #933 * Better opening performance #929 #933
* Fix memory usage setting #941
KeePassDX(2.9.14) KeePassDX(2.9.14)
* Add custom icons #96 * Add custom icons #96

View File

@@ -32,7 +32,7 @@ class InputKdfSizePreference @JvmOverloads constructor(context: Context,
override fun setSummary(summary: CharSequence) { override fun setSummary(summary: CharSequence) {
if (summary == UNKNOWN_VALUE_STRING) { if (summary == UNKNOWN_VALUE_STRING) {
super.setSummary("") super.setSummary(summary)
} else { } else {
var summaryString = summary var summaryString = summary
try { try {

View File

@@ -1,3 +1,4 @@
* Fix themes #935 #926 * Fix themes #935 #926
* Decrease default clipboard time #934 * Decrease default clipboard time #934
* Better opening performance #929 #933 * Better opening performance #929 #933
* Fix memory usage setting #941

View File

@@ -1,3 +1,4 @@
* Correction des themes #935 #926 * Correction des themes #935 #926
* Baisse du temps du presse-papier par defaut #934 * Baisse du temps du presse-papier par defaut #934
* Meilleures performaces d'ouverture #929 #933 * Meilleures performaces d'ouverture #929 #933
* Correction du paramètre d'usage mémoire #941