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/NEWS | |
| 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/NEWS')
| -rw-r--r-- | perl-install/NEWS | 3 |
1 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 |