]> code.delx.au - pulseaudio/commitdiff
delx.au / code / pulseaudio / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11da057 fc339a6)
Merge remote-tracking branch 'zonique/osx'
authorColin Guthrie <cguthrie@mandriva.org>
Thu, 24 Mar 2011 09:08:05 +0000 (09:08 +0000)
committerColin Guthrie <cguthrie@mandriva.org>
Thu, 24 Mar 2011 09:08:05 +0000 (09:08 +0000)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history
src/pulsecore/core-util.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/pulsecore/core-util.c
Simple merge