summaryrefslogtreecommitdiffstats
path: root/streams/stream.db
diff options
context:
space:
mode:
authortv <tv@xso>2011-08-29 14:42:20 +0200
committertv <tv@xso>2011-08-29 14:42:20 +0200
commit3c0470524cd39f722d1e39247f8b0b68c418b231 (patch)
tree6da5d09e3957305c939c45c59cbaf14e10ce6f66 /streams/stream.db
parent8c521570fe1ff45c22aa1a4c7f93538841fc1665 (diff)
parentcdbc8c537320e3e534694311516ac398ea501600 (diff)
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'streams/stream.db')
-rw-r--r--streams/stream.db2
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