Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

Conflicts:
	src/modules/module-stream-restore.c
This commit is contained in:
Tanu Kaskinen 2009-08-30 20:07:31 +03:00
commit 0ad2d55cbe
46 changed files with 720 additions and 173 deletions

View file

@ -64,5 +64,8 @@ void pa_volume_func_init_mmx(pa_cpu_x86_flag_t flags);
void pa_volume_func_init_sse(pa_cpu_x86_flag_t flags);
void pa_remap_func_init_mmx(pa_cpu_x86_flag_t flags);
void pa_remap_func_init_sse(pa_cpu_x86_flag_t flags);
void pa_convert_func_init_sse (pa_cpu_x86_flag_t flags);
#endif /* foocpux86hfoo */