diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-06-11 15:59:08 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-06-11 15:59:08 +0200 |
| commit | 099bca141efc72e8ded5245b47ed38e202e3f4e9 (patch) | |
| tree | 27949217be1fab8da2a83726250cf41597def0d0 /build | |
| parent | 6195cb16908be69b07d7620dc1dffacbd8bbe31b (diff) | |
| parent | 091253696f83a6b3c8a6e5976f5138e1caaa71f0 (diff) | |
Merge branch 'master' into coverart_color_and_digest
Diffstat (limited to 'build')
| -rw-r--r-- | build/debian/changelog | 2 | ||||
| -rw-r--r-- | build/features.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/debian/changelog b/build/debian/changelog index f0ac68b858..fbfc06ea56 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,4 +1,4 @@ -mixxx (2.2.3-0ubuntu1) bionic; urgency=medium +mixxx (2.2.4-0ubuntu3) bionic; urgency=medium * Bugfix release diff --git a/build/features.py b/build/features.py index 88e3738d61..31d38dd187 100644 --- a/build/features.py +++ b/build/features.py @@ -1213,7 +1213,7 @@ class QtKeychain(Feature): return "Secure credentials storage support for Live Broadcasting profiles" def enabled(self, build): - build.flags['qtkeychain'] = util.get_flags(build.env, 'qtkeychain', 0) + build.flags['qtkeychain'] = util.get_flags(build.env, 'qtkeychain', 1) if int(build.flags['qtkeychain']): return True return False |