From: ghost <andreas.monzner@multimedia-labs.de>
Date: Sat, 2 Jan 2010 09:58:02 +0000 (+0100)
Subject: Merge remote branch 'origin/bug_112_enable_extensions_manager'
X-Git-Tag: 2.7.0~10
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/64cfba23aba53b4ab3933284b2a4a9ef5ec68e26?hp=-c

Merge remote branch 'origin/bug_112_enable_extensions_manager'
---

64cfba23aba53b4ab3933284b2a4a9ef5ec68e26
diff --combined data/skin_default/Makefile.am
index 3106af97,15f4a54f..9e9b7cd4
mode 100644,100755..100755
--- a/data/skin_default/Makefile.am
+++ b/data/skin_default/Makefile.am
@@@ -15,6 -15,7 +15,7 @@@ dist_install_DATA = 
  	border_eventinfo.png \
  	border_info.png \
  	border_menu_300.png \
+ 	border_menu_350.png \
  	border_menu.png \
  	border_multiepg.png \
  	bottombar.png \
@@@ -50,7 -51,6 +51,7 @@@
  	sleeptimer.png \
  	timeline-now.png \
  	timeline.png \
 +	unhandled-key.png \
  	verticalline-plugins.png \
  	vkey_backspace.png \
  	vkey_bg.png \