From: acid-burn <acid-burn@opendreambox.org>
Date: Tue, 5 Oct 2010 10:58:30 +0000 (+0200)
Subject: Merge commit 'origin/bug_69_configurable_inputdevice_delay'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=5fc72d747469d805943e5310dcc6bc9e748300e6

Merge commit 'origin/bug_69_configurable_inputdevice_delay'
---

5fc72d747469d805943e5310dcc6bc9e748300e6
diff --cc data/skin_default/icons/Makefile.am
index 088556a,67fe52d..c6cb269
mode 100755,100644..100755
--- a/data/skin_default/icons/Makefile.am
+++ b/data/skin_default/icons/Makefile.am