From 7dd0823e93f9ddc25ccc59eff7ce6f5419962757 Mon Sep 17 00:00:00 2001
From: root
Date: Sat, 3 Sep 2016 19:57:18 +0200
Subject: uncomitted changes on server

---
 configs/conferences/mrmcd16/config.php          |   4 ++--
 configs/conferences/mrmcd16/main.less           |   0
 configs/conferences/mrmcd16/ws_mrmcd16.svg      |   0
 configs/conferences/mrmcd16/ws_mrmcd16_logo.svg |   0
 configs/conferences/qtcon16/QtCon_logo.png      | Bin
 configs/conferences/qtcon16/config.php          |   1 -
 configs/conferences/qtcon16/main.less           |   0
 7 files changed, 2 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 configs/conferences/mrmcd16/config.php
 mode change 100644 => 100755 configs/conferences/mrmcd16/main.less
 mode change 100644 => 100755 configs/conferences/mrmcd16/ws_mrmcd16.svg
 mode change 100644 => 100755 configs/conferences/mrmcd16/ws_mrmcd16_logo.svg
 mode change 100644 => 100755 configs/conferences/qtcon16/QtCon_logo.png
 mode change 100644 => 100755 configs/conferences/qtcon16/config.php
 mode change 100644 => 100755 configs/conferences/qtcon16/main.less

(limited to 'configs/conferences')

diff --git a/configs/conferences/mrmcd16/config.php b/configs/conferences/mrmcd16/config.php
old mode 100644
new mode 100755
index 76116c5..845114b
--- a/configs/conferences/mrmcd16/config.php
+++ b/configs/conferences/mrmcd16/config.php
@@ -82,7 +82,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
 	 * Link zu den Recordings
 	 * Wird diese Zeile auskommentiert, wird der Link nicht angezeigt
 	 */
-	'RELEASES' => 'https://media.ccc.de/c/mrmcd2016',
+	'RELEASES' => 'https://media.ccc.de/c/mrmcd16',
 
 	/**
 	 * Link zu einer (externen) ReLive-Übersichts-Seite
@@ -577,7 +577,7 @@ $GLOBALS['CONFIG']['SCHEDULE'] = array(
          *
          * Wird diese Zeile auskommentiert, werden alle Räume angezeigt
          */
-        'ROOMFILTER' => array('saal104', 'saal111'),
+        //'ROOMFILTER' => array('saal104', 'saal111'),
 
 	/**
 	 * Skalierung der Programm-Vorschau in Sekunden pro Pixel
diff --git a/configs/conferences/mrmcd16/main.less b/configs/conferences/mrmcd16/main.less
old mode 100644
new mode 100755
diff --git a/configs/conferences/mrmcd16/ws_mrmcd16.svg b/configs/conferences/mrmcd16/ws_mrmcd16.svg
old mode 100644
new mode 100755
diff --git a/configs/conferences/mrmcd16/ws_mrmcd16_logo.svg b/configs/conferences/mrmcd16/ws_mrmcd16_logo.svg
old mode 100644
new mode 100755
diff --git a/configs/conferences/qtcon16/QtCon_logo.png b/configs/conferences/qtcon16/QtCon_logo.png
old mode 100644
new mode 100755
diff --git a/configs/conferences/qtcon16/config.php b/configs/conferences/qtcon16/config.php
old mode 100644
new mode 100755
index 238a2c9..c1407af
--- a/configs/conferences/qtcon16/config.php
+++ b/configs/conferences/qtcon16/config.php
@@ -123,7 +123,6 @@ $GLOBALS['CONFIG']['OVERVIEW'] = array(
 			'b05b06',
 			'b07b08',
 			'b09',
-			'a04',
 			'a08',
 		),
 	),
diff --git a/configs/conferences/qtcon16/main.less b/configs/conferences/qtcon16/main.less
old mode 100644
new mode 100755
-- 
cgit v1.2.3