update to master

This commit is contained in:
Chengyi Zhao 2024-06-25 17:03:12 +08:00
parent 7138fa0272
commit fccb4bd29d
107 changed files with 29 additions and 51635 deletions

View file

@ -1,24 +1,5 @@
if bashcompletiondir != 'no'
aliases = []
<<<<<<< HEAD
if get_option('daemon')
aliases += [
'pacmd',
'pasuspender',
]
endif
aliases += [
'pacat',
'pactl',
'padsp',
'paplay',
'parec',
'parecord',
]
=======
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
if get_option('daemon')
aliases += [