From: Lennart Poettering Date: Thu, 23 Jul 2009 13:18:06 +0000 (+0200) Subject: Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio X-Git-Tag: submit/2.0-panda/20130828.192557~1618 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=88d5749f6ae8d391963a12a6221f006de2947e50;p=profile%2Fivi%2Fpulseaudio-panda.git Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio Conflicts: src/daemon/main.c --- 88d5749f6ae8d391963a12a6221f006de2947e50