[svn-upgrade] Integrating new upstream version, teleschorsch (0.1.3)

diff --git a/ChangeLog b/ChangeLog
index 510bea4788836c94b720a40ec92f936ab557b7ee..6701a3fa3a09cb7bc51752f65d81d53b7d9b2938 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 ------------------------------------------------------------------------
+r441 | gregoa | 2007-03-08 17:09:47 +0100 (Thu, 08 Mar 2007) | 1 line
+Changed paths:
+   M /teleschorsch/trunk/qteleschorsch_fr.ts
+
+s/Chaine/Chaîne/
+------------------------------------------------------------------------
 r440 | gregoa | 2007-03-08 00:21:17 +0100 (Thu, 08 Mar 2007) | 1 line
 Changed paths:
    M /teleschorsch/trunk/makedist

diff --git a/teleschorschrc b/teleschorschrc
index 8b867c0ee6a303642d88595a2498ab19e15694b8..2976111ff256fa6b3373adea522ddb6c47406c12 100644 (file)
--- a/teleschorschrc
+++ b/teleschorschrc
@@ -38,11 +38,11 @@ FULLNAME=France 3 - JT le soir national
 STATICURL=mms://sdmc.contents.edgestreams.net/horsgv/regions/siege/infos/f3/soir3/HD_soir3_${Y}${m}${d}.wmv?WMCache=0
 PLAYER=vlc
 
-[M61250]
-FULLNAME=M6 - le 12 50
-STATICURL=mms://stream1.m6.fr.ipercast.net/m6.fr/6minutes/d/92/d${y}${m}${d}211151SARAV9200000.wmv
-PLAYER=vlc
-
+#[M61250]
+#FULLNAME=M6 - le 12 50
+#STATICURL=mms://stream1.m6.fr.ipercast.net/m6.fr/6minutes/d/92/d${y}${m}${d}211151SARAV9200000.wmv
+#PLAYER=vlc
+#
 [M6six]
 FULLNAME=M6 - six
 STATICURL=mms://stream1.m6.fr.ipercast.net/m6.fr/6minutes/d/92/d${y}${m}${d}190000SARAV9200000.wmv
@@ -71,4 +71,4 @@ PLAYER=vlc
 [ORFoe118]
 FULLNAME=ORF - Ö1 Abendjournal (only current broadcast)
 STATICURL=`wget -q -O- "http://oe1.orf.at/konsole/journal?type=abend" | grep -Eo "mms://stream2\.orf\.at/oe1/demand/abend/.+\.WMA"`
-PLAYER=vlc
\ No newline at end of file
+PLAYER=vlc