filteraudio-git: Resolved merge conflicts as requested by Gottox

This commit is contained in:
Stefan Mühlinghaus
2015-03-11 15:29:05 +01:00
committed by Stefan Mühlinghaus
parent 2f3bf68b32
commit 9258f7c4be
3 changed files with 28 additions and 0 deletions

View File

@@ -1960,3 +1960,4 @@ libusbredirhost.so.1 usbredir-0.7_1
libprotobuf-c.so.1 protobuf-c-1.1.0_1
libutf8proc.so.1 libutf8proc-1.1.6_1
libnsutils.so.0 libnsutils-0.0.1_1
libfilteraudio.so.0 filteraudio-git-20150313_1