summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS
diff options
context:
space:
mode:
authorChristian Wieninger <cwieninger (at) gmx (dot) de>2009-08-27 00:19:01 +0200
committerChristian Wieninger <cwieninger (at) gmx (dot) de>2009-08-27 00:19:01 +0200
commitac835e1d5366908e0c3a706ed3c9298041c4bad9 (patch)
treedc26c51cf47f411ac8d0a0b28b845c5c5886b680 /CONTRIBUTORS
parent8c131a1710f1b8c83c09e4f247cc0ba44c0ec4bb (diff)
parent854fa820e345ed890e4a7a9a32b14add68fc642c (diff)
downloadvdr-plugin-live-ac835e1d5366908e0c3a706ed3c9298041c4bad9.tar.gz
vdr-plugin-live-ac835e1d5366908e0c3a706ed3c9298041c4bad9.tar.bz2
Merge commit 'tadi/master'
Conflicts: po/de_DE.po
Diffstat (limited to 'CONTRIBUTORS')
-rw-r--r--CONTRIBUTORS7
1 files changed, 5 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9e1b234..1f7def6 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -12,7 +12,7 @@ Rolf Ahrenberg
vlc plugin for firefox. And a lot of usefull hints about the features
of the vlc plugins, some of which still need to be added to LIVE.
-Patrice Staudt
+Patrice Staudt (in memoriam)
for the french translations.
Matthias Kortstiege
@@ -21,4 +21,7 @@ Matthias Kortstiege
Recomended is tntnet version 1.6.2 and higher.
Diego Pierotto
- for the italian translations. \ No newline at end of file
+ for the italian translations.
+
+John Germs, Chavonbravo from CaptiveWorks (http://captiveworks.org)
+ for the addition of channel numbers on the live pages.