summaryrefslogtreecommitdiffstats
path: root/streams/stream.db
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2011-09-12 14:32:18 +0200
committermakefu <github@syntax-fehler.de>2011-09-12 14:32:18 +0200
commit9f70f9b5b462aa3e150b9708f695edfaf716edd4 (patch)
tree5cbebe6cbc0ada2c988d7f14d0bbbc52a68b37c1 /streams/stream.db
parent568fbd7fa5541182bbbc33560863ec9c3ff01d48 (diff)
parenta07326f6c57a7e8f49b9bef96ded427275a16e2e (diff)
Merge branch 'master' into punani_files
Diffstat (limited to 'streams/stream.db')
-rw-r--r--streams/stream.db1
1 files changed, 1 insertions, 0 deletions
diff --git a/streams/stream.db b/streams/stream.db
index 5efeb9ea..47ccf7b5 100644
--- a/streams/stream.db
+++ b/streams/stream.db
@@ -6,3 +6,4 @@ 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