Origin commit data
------------------
Branch: ni/coolstream
Commit: d56b7da446
Author: martii <m4rtii@gmx.de>
Date: 2013-06-21 (Fri, 21 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Conflicts:
src/gui/proxyserver_setup.cpp
src/neutrino.cpp
src/system/httptool.cpp
src/system/settings.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 58124802ce
Author: martii <m4rtii@gmx.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b236ea1c8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-14 (Fri, 14 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ac6bcb6b5
Author: martii <m4rtii@gmx.de>
Date: 2013-06-14 (Fri, 14 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Conflicts:
src/gui/moviebrowser.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: f6ae1796f2
Author: martii <m4rtii@gmx.de>
Date: 2013-06-13 (Thu, 13 Jun 2013)
------------------
This commit was generated by Migit
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/gui/moviebrowser.cpp
src/system/locals.h
src/system/locals_intern.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fac02ba45
Author: martii <m4rtii@gmx.de>
Date: 2013-06-13 (Thu, 13 Jun 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a9978d37c1
Author: martii <m4rtii@gmx.de>
Date: 2013-06-12 (Wed, 12 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Conflicts:
src/gui/moviebrowser.cpp
src/gui/movieinfo.cpp
src/system/Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: 70e5e66327
Author: martii <m4rtii@gmx.de>
Date: 2013-06-12 (Wed, 12 Jun 2013)
------------------
This commit was generated by Migit
