Merge commit 'origin/bug_69_configurable_inputdevice_delay'
authoracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 10:58:30 +0000 (12:58 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 10:58:30 +0000 (12:58 +0200)
commit5fc72d747469d805943e5310dcc6bc9e748300e6
treed28b6cc41272456897bd73ddfd740c793300cac7
parentb6da0afe0cd5cf7ba08427fd1b8e2fe9bb270901
parent97f8d756b444ef1d308f2c6e80b62e5e5a057cc1
Merge commit 'origin/bug_69_configurable_inputdevice_delay'
data/skin_default/icons/Makefile.am