From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 6 Oct 2010 09:59:31 +0000 (+0200)
Subject: Merge branch 'bug_531_fixed_not_visible_parental_control_padlock'
X-Git-Tag: 3.0.0~77
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/0c8665143633b5f854db9b72102f3c87a16f1722?hp=-c

Merge branch 'bug_531_fixed_not_visible_parental_control_padlock'
---

0c8665143633b5f854db9b72102f3c87a16f1722
diff --combined data/skin_default/Makefile.am
index 6038c2e9,9e9b7cd4..30b04f91
--- a/data/skin_default/Makefile.am
+++ b/data/skin_default/Makefile.am
@@@ -23,7 -23,6 +23,7 @@@ dist_install_DATA = 
  	b_tl.png \
  	b_t.png \
  	b_tr.png \
 +	celserviceeventprogressbar.png \
  	div-h.png \
  	div-v.png \
  	epg_more.png \
@@@ -33,8 -32,6 +33,6 @@@
  	expanded-plugins.png \
  	info-bg_mp.png \
  	info-bg.png \
- 	lock.png \
- 	lockBouquet.png \
  	mediaplayer_bg.png \
  	mute.png \
  	nim_active.png \
@@@ -55,8 -52,6 +53,6 @@@
  	timeline-now.png \
  	timeline.png \
  	unhandled-key.png \
- 	unlock.png \
- 	unlockBouquet.png \
  	verticalline-plugins.png \
  	vkey_backspace.png \
  	vkey_bg.png \
diff --combined data/skin_default/icons/Makefile.am
index c6cb269e,38e32376..b453aa77
mode 100755,100644..100755
--- a/data/skin_default/icons/Makefile.am
+++ b/data/skin_default/icons/Makefile.am
@@@ -27,27 -27,14 +27,28 @@@ dist_install_DATA = 
  	icon_view.png \
  	input_error.png \
  	input_info.png \
 +	input_keyboard-configured.png \
 +	input_keyboard.png \
 +	input_mouse-configured.png \
 +	input_mouse.png \
  	input_question.png \
 +	input_rcnew-configured.png \
 +	input_rcnew.png \
 +	input_rcold-configured.png \
 +	input_rcold.png \
  	lock_error.png \
  	lock_off.png \
  	lock_on.png \
  	lock.png \
+ 	lockBouquet.png \
  	marker.png \
  	mp_buttons.png \
 +	network_wired.png \
 +	network_wired-active.png \
 +	network_wired-inactive.png \	
 +	network_wireless.png \
 +	network_wireless-active.png \
 +	network_wireless-inactive.png \	
  	plugin.png \
  	rass_logo.png \
  	rass_page1.png \
@@@ -61,5 -48,6 +62,7 @@@
  	scan-c.png \
  	scan-s.png \
  	scan-t.png \
- 	selectioncross.png
+ 	selectioncross.png \
+ 	unlock.png \
+ 	unlockBouquet.png
 +