diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-06 11:59:31 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-06 11:59:31 +0200 |
| commit | 0c8665143633b5f854db9b72102f3c87a16f1722 (patch) | |
| tree | 86099d7d5ca3804de0143885c3f40d7769af4b5e /data | |
| parent | 37152843c915fd0a9352256d804ced4ff54c23c4 (diff) | |
| parent | 599e3172d1d04be8513fdf2e706d9ec3faedd054 (diff) | |
| download | enigma2-0c8665143633b5f854db9b72102f3c87a16f1722.tar.gz enigma2-0c8665143633b5f854db9b72102f3c87a16f1722.zip | |
Merge branch 'bug_531_fixed_not_visible_parental_control_padlock'
Diffstat (limited to 'data')
| -rwxr-xr-x | data/skin_default/Makefile.am | 4 | ||||
| -rwxr-xr-x | data/skin_default/icons/Makefile.am | 5 | ||||
| -rw-r--r-- | data/skin_default/icons/lock.png | bin | 1729 -> 1053 bytes | |||
| -rw-r--r-- | data/skin_default/icons/lockBouquet.png (renamed from data/skin_default/lockBouquet.png) | bin | 1176 -> 1176 bytes | |||
| -rw-r--r-- | data/skin_default/icons/unlock.png (renamed from data/skin_default/unlock.png) | bin | 965 -> 965 bytes | |||
| -rw-r--r-- | data/skin_default/icons/unlockBouquet.png (renamed from data/skin_default/unlockBouquet.png) | bin | 1141 -> 1141 bytes | |||
| -rw-r--r-- | data/skin_default/lock.png | bin | 1053 -> 0 bytes |
7 files changed, 4 insertions, 5 deletions
diff --git a/data/skin_default/Makefile.am b/data/skin_default/Makefile.am index 6038c2e9..30b04f91 100755 --- a/data/skin_default/Makefile.am +++ b/data/skin_default/Makefile.am @@ -33,8 +33,6 @@ dist_install_DATA = \ expanded-plugins.png \ info-bg_mp.png \ info-bg.png \ - lock.png \ - lockBouquet.png \ mediaplayer_bg.png \ mute.png \ nim_active.png \ @@ -55,8 +53,6 @@ dist_install_DATA = \ timeline-now.png \ timeline.png \ unhandled-key.png \ - unlock.png \ - unlockBouquet.png \ verticalline-plugins.png \ vkey_backspace.png \ vkey_bg.png \ diff --git a/data/skin_default/icons/Makefile.am b/data/skin_default/icons/Makefile.am index c6cb269e..b453aa77 100755 --- a/data/skin_default/icons/Makefile.am +++ b/data/skin_default/icons/Makefile.am @@ -40,6 +40,7 @@ dist_install_DATA = \ lock_off.png \ lock_on.png \ lock.png \ + lockBouquet.png \ marker.png \ mp_buttons.png \ network_wired.png \ @@ -61,5 +62,7 @@ dist_install_DATA = \ scan-c.png \ scan-s.png \ scan-t.png \ - selectioncross.png + selectioncross.png \ + unlock.png \ + unlockBouquet.png diff --git a/data/skin_default/icons/lock.png b/data/skin_default/icons/lock.png Binary files differindex cfee1ba8..d0ae7f64 100644 --- a/data/skin_default/icons/lock.png +++ b/data/skin_default/icons/lock.png diff --git a/data/skin_default/lockBouquet.png b/data/skin_default/icons/lockBouquet.png Binary files differindex d503dd2b..d503dd2b 100644 --- a/data/skin_default/lockBouquet.png +++ b/data/skin_default/icons/lockBouquet.png diff --git a/data/skin_default/unlock.png b/data/skin_default/icons/unlock.png Binary files differindex bd4486e9..bd4486e9 100644 --- a/data/skin_default/unlock.png +++ b/data/skin_default/icons/unlock.png diff --git a/data/skin_default/unlockBouquet.png b/data/skin_default/icons/unlockBouquet.png Binary files differindex c5d146d7..c5d146d7 100644 --- a/data/skin_default/unlockBouquet.png +++ b/data/skin_default/icons/unlockBouquet.png diff --git a/data/skin_default/lock.png b/data/skin_default/lock.png Binary files differdeleted file mode 100644 index d0ae7f64..00000000 --- a/data/skin_default/lock.png +++ /dev/null |
