diff options
| author | EUcancER <root@euer.krebsco.de> | 2011-08-31 12:52:15 +0200 |
|---|---|---|
| committer | EUcancER <root@euer.krebsco.de> | 2011-08-31 12:52:15 +0200 |
| commit | a2e4ac21444fd9af436039ba921e809cfca59ea2 (patch) | |
| tree | e12c692527bc9b2b373cf0a4956f0ff458045cd7 /streams/stream.db | |
| parent | efe72ae286caa4ecf88edcbcb619fb0ceb886ca8 (diff) | |
| parent | cf46dbc53b36772fb0461b9451337c118e705c55 (diff) | |
Gigantor Merge!
Conflicts:
cholerab/news/Candidate - add Ante scriptum
cholerab/shirts/bestellliste - merged as theirs
oncology/dpfhack_display - now a submodule
add bug-fixing for adv_graphgen, as well as a Makefile
Diffstat (limited to 'streams/stream.db')
| -rw-r--r-- | streams/stream.db | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/streams/stream.db b/streams/stream.db index e97a202e..5efeb9ea 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -4,3 +4,5 @@ http://streams.xenim.de/radiotux.ogg radiotux http://bassdrive.com/v2/streams/BassDrive.pls bassdrive http://somafm.com/illstreet.pls illstreet http://localhost:8000/stream.ogg icecast +http://stream2.jungletrain.net:8000 jungletrain +http://playlist.tormentedradio.com/tormentedradio.pls tormented |