diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2003-09-14 11:17:07 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2003-09-14 11:17:07 +0200 |
| commit | 78fbdfa0f74585d45c7a49fb2c7e7544bb6492ca (patch) | |
| tree | f57f041f97c513b6690525f0108a9e42dedcb55e | |
| parent | e45b9d0be31116209ce6d90ff77834d9b13c6b9b (diff) | |
| download | vdr-78fbdfa0f74585d45c7a49fb2c7e7544bb6492ca.tar.gz vdr-78fbdfa0f74585d45c7a49fb2c7e7544bb6492ca.tar.bz2 | |
Updated 'ca.conf'1.2.5pre3
| -rw-r--r-- | CONTRIBUTORS | 3 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | ca.conf | 14 |
3 files changed, 10 insertions, 8 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0c09732d..04e01a2f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -818,3 +818,6 @@ Hans Dingemans <hans.dingemans@tacticalops.nl> Alexander Wetzel <alexander.wetzel@web.de> for suggesting to let VDR start up even if 'keymacros.conf' references a plugin that is currently not loaded + +Marco Franceschetti <ordaz@quipo.it> + for updating 'ca.conf' @@ -2397,3 +2397,4 @@ Video Disk Recorder Revision History (suggested by Oliver Endriss). - Made cOsdMenu::Display() virtual, which allows plugins to do some additional processing after calling the base class function (suggested by Jan Rieger). +- Updated 'ca.conf' (thanks to Marco Franceschetti). @@ -31,6 +31,7 @@ 404 Parabole Reunion 405 Hrvatska radiotelevizija 406 RTV Slovenija +407 Visat # Viaccess 2 @@ -52,6 +53,7 @@ # Nagravision 901 PolSat Cyfrowy +902 TV Cabo # Irdeto 2 @@ -68,13 +70,9 @@ 10001 AB Sat France 10002 TPS France -# Videoguard, Mediaguard 2, Irdeto 1 +# Videoguard, Mediaguard 2, Irdeto 2 -11001 Stream TV Italy - -# Videoguard, Mediaguard 2, Cryptoworks - -12001 Tele+ Digitale +12001 Sky Italia # Mediaguard 1, Irdeto 1 @@ -84,9 +82,9 @@ 14001 Canal Satellite France -# Mediaguard 1, Mediaguard 2, Viaccess 1, Cryptoworks +# Mediaguard 2, Nagravision -15001 Canal Satelite Digital Espana +15001 Digital+ Espana # Mediaguard 2, Cryptoworks |