mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-29 06:59:51 -05:00
update to master
This commit is contained in:
parent
7138fa0272
commit
fccb4bd29d
107 changed files with 29 additions and 51635 deletions
|
|
@ -19,13 +19,8 @@ variables:
|
|||
# CI runs, for example when adding new packages to FDO_DISTRIBUTION_PACKAGES.
|
||||
# The tag is an arbitrary string that identifies the exact container
|
||||
# contents.
|
||||
<<<<<<< HEAD
|
||||
FDO_DISTRIBUTION_TAG: '2021-03-01-02'
|
||||
FDO_DISTRIBUTION_VERSION: '18.04'
|
||||
=======
|
||||
FDO_DISTRIBUTION_TAG: '2023-08-13-00'
|
||||
FDO_DISTRIBUTION_VERSION: '20.04'
|
||||
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
|
||||
FDO_UPSTREAM_REPO: 'pulseaudio/pulseaudio'
|
||||
|
||||
include:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue