Conflicts:
src/gui/audioplayer.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d02024ae1
Author: martii <m4rtii@gmx.de>
Date: 2013-11-11 (Mon, 11 Nov 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e41f122970
Author: martii <m4rtii@gmx.de>
Date: 2013-10-31 (Thu, 31 Oct 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3f31195a2
Author: martii <m4rtii@gmx.de>
Date: 2013-10-20 (Sun, 20 Oct 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a7b190790
Author: martii <m4rtii@gmx.de>
Date: 2013-10-20 (Sun, 20 Oct 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Conflicts:
configure.ac
src/Makefile.am
src/driver/audiodec/Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: d5ea074457
Author: martii <m4rtii@gmx.de>
Date: 2013-10-19 (Sat, 19 Oct 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bcd72afe3
Author: martii <m4rtii@gmx.de>
Date: 2013-10-17 (Thu, 17 Oct 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c11aa70f28
Author: martii <m4rtii@gmx.de>
Date: 2013-10-13 (Sun, 13 Oct 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 52620ccc91
Author: martii <m4rtii@gmx.de>
Date: 2013-10-13 (Sun, 13 Oct 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
