summaryrefslogtreecommitdiffstats
path: root/streams/stream.db
diff options
context:
space:
mode:
authorChinaman <root@chinaman>2011-09-06 19:47:58 +0200
committerChinaman <root@chinaman>2011-09-06 19:47:58 +0200
commit108f3616e3f4958752d881192ef29e5fc4c2b045 (patch)
tree3c67478c852265219b72e6e1b05467d7065b7ba8 /streams/stream.db
parentb2d65500160bcdf7abb2bf985f7da582b810e25c (diff)
parentc3bc5a6d16868c121aca780f3109155797b51d76 (diff)
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'streams/stream.db')
-rw-r--r--streams/stream.db5
1 files changed, 5 insertions, 0 deletions
diff --git a/streams/stream.db b/streams/stream.db
index 484abaad..47ccf7b5 100644
--- a/streams/stream.db
+++ b/streams/stream.db
@@ -2,3 +2,8 @@ http://somafm.com/groovesalad.pls groove
http://deepmix.ru/deepmix128.pls deepmix
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
+http://filebitch.shack:8000 mpd