diff options
author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2009-04-09 19:54:08 +0200 |
---|---|---|
committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2009-04-09 19:54:08 +0200 |
commit | 6b2f2f995d712b1793dd1a24ce2d64df616d4b30 (patch) | |
tree | ad8e6150689847c3b417b6e40345de3f5d8c112e /uservars.h | |
parent | 6f4d6719b0366054f1c3e52c1244bde112de3e36 (diff) | |
parent | 47f9a76b9e8c6611c218f24361b5afcac4ab3052 (diff) | |
download | vdr-plugin-epgsearch-6b2f2f995d712b1793dd1a24ce2d64df616d4b30.tar.gz vdr-plugin-epgsearch-6b2f2f995d712b1793dd1a24ce2d64df616d4b30.tar.bz2 |
Merge branch 'master' of git+ssh://gandalf/srv/git/epgsearch
Conflicts:
po/ca_ES.po
po/cs_CZ.po
po/da_DK.po
po/de_DE.po
po/el_GR.po
po/es_ES.po
po/et_EE.po
po/fi_FI.po
po/fr_FR.po
po/hr_HR.po
po/hu_HU.po
po/it_IT.po
po/nl_NL.po
po/nn_NO.po
po/pl_PL.po
po/pt_PT.po
po/ro_RO.po
po/ru_RU.po
po/sl_SI.po
po/sv_SE.po
po/tr_TR.po
Diffstat (limited to 'uservars.h')
0 files changed, 0 insertions, 0 deletions