Stefan Seyfried 0cf191822a Merge branch 'check/dvbsi++' commit 5db16ee2ff ...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp

2013-02-21 17:07:18 +01:00

..

helpers

locale: adapt helper scripts to current compilers

2012-12-31 22:16:46 +01:00

unmaintained

Merge branch 'uncool/dvbsi++' commit '7ea3a20a808'

2012-11-03 10:45:33 +01:00

_readme.txt

- locale: improve maintainer-targets

2012-10-25 10:43:56 +02:00

deutsch.locale

Merge branch 'check/dvbsi++' commit 5db16ee2ff

2013-02-21 17:07:18 +01:00

english.locale

Merge branch 'check/dvbsi++' commit 5db16ee2ff

2013-02-21 17:07:18 +01:00

Makefile.am

locale: fix ordercheck target

2012-12-31 22:16:46 +01:00