[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.12-94-g9e79c87

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  644f39d261a4389a0ab19650eda7d8472074367b (commit)

- Log -----------------------------------------------------------------
9e79c87... Merge commit 'coling/master'
cd704f8... Linking fix for rtclock on libpulsedsp
-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------

commit cd704f8a84635bc6ea152d44d2dd183c22157d36
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Sat Sep 6 12:25:46 2008 +0100

    Linking fix for rtclock on libpulsedsp

diff --git a/src/Makefile.am b/src/Makefile.am
index 3ee5372..22e691f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -654,7 +654,7 @@ bin_SCRIPTS += utils/padsp
 
 endif
 
-libpulsedsp_la_SOURCES = utils/padsp.c pulsecore/core-util.c pulsecore/core-util.h pulsecore/core-error.c pulsecore/core-error.h  pulsecore/log.c pulsecore/log.h pulsecore/once.c pulsecore/once.h $(PA_THREAD_OBJS)
+libpulsedsp_la_SOURCES = utils/padsp.c pulsecore/core-util.c pulsecore/core-util.h pulsecore/core-error.c pulsecore/core-error.h  pulsecore/log.c pulsecore/log.h pulsecore/rtclock.c pulsecore/rtclock.h pulsecore/once.c pulsecore/once.h $(PA_THREAD_OBJS)
 libpulsedsp_la_CFLAGS = $(AM_CFLAGS)
 libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la
 libpulsedsp_la_LDFLAGS = -avoid-version

commit 9e79c875a5629f64211dbf33dffb7a6c8abc3cc8
Merge: 644f39d... cd704f8...
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Oct 1 01:52:14 2008 +0200

    Merge commit 'coling/master'


-- 
hooks/post-receive
PulseAudio Sound Server