aboutsummaryrefslogtreecommitdiff
path: root/configs/conferences/32c3
diff options
context:
space:
mode:
authorMaZderMind2015-12-10 19:09:26 +0100
committerMaZderMind2015-12-10 19:09:26 +0100
commitbecad9f9cd58506e931a4a82eb3c9a111e832cf3 (patch)
treec8489a17d62aeb331d33d2e282fd048756dff701 /configs/conferences/32c3
parented2552ae3f321ff5b3cd04b18b33a0cbe3f4008a (diff)
[32C3] Remove Congress-Radio, add Chaos-West Musikprogramm
Diffstat (limited to 'configs/conferences/32c3')
-rw-r--r--configs/conferences/32c3/config.php15
1 files changed, 5 insertions, 10 deletions
diff --git a/configs/conferences/32c3/config.php b/configs/conferences/32c3/config.php
index 27c2a4b..8aa918b 100644
--- a/configs/conferences/32c3/config.php
+++ b/configs/conferences/32c3/config.php
@@ -116,14 +116,14 @@ $GLOBALS['CONFIG']['OVERVIEW'] = array(
'saal6',
),
- 'Live DJ Sets' => array(
+ 'Live Music' => array(
'lounge',
'ambient',
+ 'chaos-west',
),
'Live Podcasts' => array(
'sendezentrum',
'podcastertisch',
- 'congressradio',
),
),
);
@@ -476,16 +476,11 @@ $GLOBALS['CONFIG']['ROOMS'] = array(
'IRC' => false,
'TWITTER' => true,
),
- 'congressradio' => array(
- 'DISPLAY' => 'Congress-Radio',
- 'STREAM' => 'congressradio',
+ 'chaos-west' => array(
+ 'DISPLAY' => 'Chaos-West Musikprogramm',
+ 'STREAM' => 'chaos-west',
'MUSIC' => true,
-
- 'SCHEDULE' => true,
- 'FEEDBACK' => true,
'EMBED' => true,
- 'IRC' => false,
- 'TWITTER' => true,
),
);