diff options
author | makefu <github@syntax-fehler.de> | 2011-08-30 11:25:00 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2011-08-30 11:25:00 +0200 |
commit | bbf2bc45f02e8795b8cda6dde262226cd658bfd4 (patch) | |
tree | 4089d3fd6ac40c0d5a91dae46a444d4c62139a22 /streams/stream.db | |
parent | cd4f8b3394e02bcb7d86d53d1b98b4b4b868b78b (diff) | |
parent | b1f0a73e5810aed4fd78aad2bb55a8a67f76df5d (diff) |
Merge branch 'master' of github.com:krebscode/painload into punani_files
Conflicts:
.gitmodules
Diffstat (limited to 'streams/stream.db')
-rw-r--r-- | streams/stream.db | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/streams/stream.db b/streams/stream.db index 34acaa71..5efeb9ea 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -5,3 +5,4 @@ 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 |