?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 219f750 4614412)
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
commit7bc8a793b8ae4c46e59a444313e4d06186de1680
authorTanu Kaskinen <tanuk@iki.fi>
Wed, 26 Aug 2009 11:29:55 +0000 (26 14:29 +0300)
committerTanu Kaskinen <tanuk@iki.fi>
Wed, 26 Aug 2009 11:29:55 +0000 (26 14:29 +0300)
tree6abd784d94df0e8eef5811dd65f6bda21ca9f554tree | snapshot (tar.gz zip)
parent219f7508f6420f94ad8c426c6aa3dc79df246f36commit | diff
parent4614412f94eef8ed65076c6fc76b463547f8f072commit | diff
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

Conflicts:
src/Makefile.am
src/Makefile.am diff1 |  diff2 |  blob | history
ALAC Integration into pulseaudio RAOP module