diff options
| author | ennael <ennael@mageia.org> | 2013-09-04 18:35:15 +0200 |
|---|---|---|
| committer | ennael <ennael@mageia.org> | 2013-09-04 18:35:15 +0200 |
| commit | ff13b8fe1d35fc268b056332e73ed552c54fc2eb (patch) | |
| tree | 67080ee49ad45b3150cd8c11f43f82d418ee3e24 /perl-install | |
| parent | b6123a770ee606b08de4fe07364b79c0cf3efbab (diff) | |
| download | drakx-ff13b8fe1d35fc268b056332e73ed552c54fc2eb.tar drakx-ff13b8fe1d35fc268b056332e73ed552c54fc2eb.tar.gz drakx-ff13b8fe1d35fc268b056332e73ed552c54fc2eb.tar.bz2 drakx-ff13b8fe1d35fc268b056332e73ed552c54fc2eb.tar.xz drakx-ff13b8fe1d35fc268b056332e73ed552c54fc2eb.zip | |
Revert "stage2: add images for LXDE,E17,Razorqt,MATE"
This reverts commit 67bc2a78c587ab4659c0f0e936d2eb98573136aa.
Conflicts:
perl-install/NEWS
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-E17-big.png | bin | 283180 -> 0 bytes | |||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-E17.png | bin | 13570 -> 0 bytes | |||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-LXDE-big.png | bin | 310111 -> 0 bytes | |||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-LXDE.png | bin | 13363 -> 0 bytes | |||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-MATE-big.png | bin | 295590 -> 0 bytes | |||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-MATE.png | bin | 12493 -> 0 bytes | |||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-RAZOR-big.png | bin | 293646 -> 0 bytes | |||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-RAZOR.png | bin | 13640 -> 0 bytes | |||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-XFCE-big.png | bin | 296889 -> 0 bytes | |||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-XFCE.png | bin | 13497 -> 0 bytes |
11 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 6cd23c7b9..572dda1ac 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,7 +1,10 @@ +<<<<<<< HEAD - fix drakauth ldap configuration (mga#10005) - ensure files are installed for nfs (mga#10301) - stage2: add Feature:Independently_install_desktop_environments - add images for LXDE,E17,Razorqt,MATE for Feature:Independently_install_desktop_environments +======= +>>>>>>> parent of 67bc2a7... stage2: add images for LXDE,E17,Razorqt,MATE - detect wifi cards managed by ssb driver (mga#9378) Version 15.57 - 16 July 2013 diff --git a/perl-install/install/pixmaps/desktop-E17-big.png b/perl-install/install/pixmaps/desktop-E17-big.png Binary files differdeleted file mode 100644 index af8cca2f5..000000000 --- a/perl-install/install/pixmaps/desktop-E17-big.png +++ /dev/null diff --git a/perl-install/install/pixmaps/desktop-E17.png b/perl-install/install/pixmaps/desktop-E17.png Binary files differdeleted file mode 100644 index 8d7640c8b..000000000 --- a/perl-install/install/pixmaps/desktop-E17.png +++ /dev/null diff --git a/perl-install/install/pixmaps/desktop-LXDE-big.png b/perl-install/install/pixmaps/desktop-LXDE-big.png Binary files differdeleted file mode 100644 index 92c14a60b..000000000 --- a/perl-install/install/pixmaps/desktop-LXDE-big.png +++ /dev/null diff --git a/perl-install/install/pixmaps/desktop-LXDE.png b/perl-install/install/pixmaps/desktop-LXDE.png Binary files differdeleted file mode 100644 index 39a9057e0..000000000 --- a/perl-install/install/pixmaps/desktop-LXDE.png +++ /dev/null diff --git a/perl-install/install/pixmaps/desktop-MATE-big.png b/perl-install/install/pixmaps/desktop-MATE-big.png Binary files differdeleted file mode 100644 index dfe2f73b9..000000000 --- a/perl-install/install/pixmaps/desktop-MATE-big.png +++ /dev/null diff --git a/perl-install/install/pixmaps/desktop-MATE.png b/perl-install/install/pixmaps/desktop-MATE.png Binary files differdeleted file mode 100644 index 5f4377180..000000000 --- a/perl-install/install/pixmaps/desktop-MATE.png +++ /dev/null diff --git a/perl-install/install/pixmaps/desktop-RAZOR-big.png b/perl-install/install/pixmaps/desktop-RAZOR-big.png Binary files differdeleted file mode 100644 index 2910b3488..000000000 --- a/perl-install/install/pixmaps/desktop-RAZOR-big.png +++ /dev/null diff --git a/perl-install/install/pixmaps/desktop-RAZOR.png b/perl-install/install/pixmaps/desktop-RAZOR.png Binary files differdeleted file mode 100644 index 65c7574cd..000000000 --- a/perl-install/install/pixmaps/desktop-RAZOR.png +++ /dev/null diff --git a/perl-install/install/pixmaps/desktop-XFCE-big.png b/perl-install/install/pixmaps/desktop-XFCE-big.png Binary files differdeleted file mode 100644 index 866305042..000000000 --- a/perl-install/install/pixmaps/desktop-XFCE-big.png +++ /dev/null diff --git a/perl-install/install/pixmaps/desktop-XFCE.png b/perl-install/install/pixmaps/desktop-XFCE.png Binary files differdeleted file mode 100644 index 40281e28e..000000000 --- a/perl-install/install/pixmaps/desktop-XFCE.png +++ /dev/null |
