mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-06 13:29:56 -05:00
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts: src/Makefile.am
This commit is contained in:
commit
2f3fc2f1d6
100 changed files with 4986 additions and 2224 deletions
|
|
@ -250,4 +250,8 @@ size_t pa_pipe_buf(int fd);
|
|||
|
||||
void pa_reset_personality(void);
|
||||
|
||||
#if defined(__linux__) && !defined(__OPTIMIZE__)
|
||||
pa_bool_t pa_run_from_build_tree(void);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue