summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorM. Voerman <rekordc@gmail.com>2012-12-19 01:30:56 +0100
committerM. Voerman <rekordc@gmail.com>2012-12-19 01:30:56 +0100
commitbbdb260084ac88f3e944671249ab528fd2e252c4 (patch)
treece9a24a86c139a3c32257d7a583a10b585da354e
parent020fe0a4d0613a7f34b1af30508334c50fa323a3 (diff)
downloadvdr-vipclient-bbdb260084ac88f3e944671249ab528fd2e252c4.tar.gz
vdr-vipclient-bbdb260084ac88f3e944671249ab528fd2e252c4.tar.bz2
changed map to merge into master
-rw-r--r--History (renamed from portal-html/History)0
-rw-r--r--channels.js (renamed from portal-html/channels.js)0
-rw-r--r--index.html (renamed from portal-html/index.html)0
-rw-r--r--mute.png (renamed from portal-html/mute.png)bin9001 -> 9001 bytes
-rw-r--r--recordings.js (renamed from portal-html/recordings.js)0
-rw-r--r--settings.js (renamed from portal-html/settings.js)0
-rw-r--r--settings2.js (renamed from portal-html/settings2.js)0
-rw-r--r--unmute.png (renamed from portal-html/unmute.png)bin7472 -> 7472 bytes
8 files changed, 0 insertions, 0 deletions
diff --git a/portal-html/History b/History
index 152fd89..152fd89 100644
--- a/portal-html/History
+++ b/History
diff --git a/portal-html/channels.js b/channels.js
index 6870c85..6870c85 100644
--- a/portal-html/channels.js
+++ b/channels.js
diff --git a/portal-html/index.html b/index.html
index 055c9f2..055c9f2 100644
--- a/portal-html/index.html
+++ b/index.html
diff --git a/portal-html/mute.png b/mute.png
index 44e9547..44e9547 100644
--- a/portal-html/mute.png
+++ b/mute.png
Binary files differ
diff --git a/portal-html/recordings.js b/recordings.js
index 2449661..2449661 100644
--- a/portal-html/recordings.js
+++ b/recordings.js
diff --git a/portal-html/settings.js b/settings.js
index 415b237..415b237 100644
--- a/portal-html/settings.js
+++ b/settings.js
diff --git a/portal-html/settings2.js b/settings2.js
index 6f5b7a6..6f5b7a6 100644
--- a/portal-html/settings2.js
+++ b/settings2.js
diff --git a/portal-html/unmute.png b/unmute.png
index 70000a8..70000a8 100644
--- a/portal-html/unmute.png
+++ b/unmute.png
Binary files differ