summaryrefslogtreecommitdiffstats
path: root/streams
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
commitd7f11b1e46c379321070afb970475416fc883e4e (patch)
tree7597b7b0e82fa35bb7a81876330f17b213c724d0 /streams
parent74e325f2c44361230aa133a61fb35cd3e596a63c (diff)
parenta76ecf0205de261a05a6cee0e07325c6e4606455 (diff)
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'streams')
-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