summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/install/pixmaps/desktop-E17-big.pngbin283180 -> 0 bytes
-rw-r--r--perl-install/install/pixmaps/desktop-E17.pngbin13570 -> 0 bytes
-rw-r--r--perl-install/install/pixmaps/desktop-LXDE-big.pngbin310111 -> 0 bytes
-rw-r--r--perl-install/install/pixmaps/desktop-LXDE.pngbin13363 -> 0 bytes
-rw-r--r--perl-install/install/pixmaps/desktop-MATE-big.pngbin295590 -> 0 bytes
-rw-r--r--perl-install/install/pixmaps/desktop-MATE.pngbin12493 -> 0 bytes
-rw-r--r--perl-install/install/pixmaps/desktop-RAZOR-big.pngbin293646 -> 0 bytes
-rw-r--r--perl-install/install/pixmaps/desktop-RAZOR.pngbin13640 -> 0 bytes
-rw-r--r--perl-install/install/pixmaps/desktop-XFCE-big.pngbin296889 -> 0 bytes
-rw-r--r--perl-install/install/pixmaps/desktop-XFCE.pngbin13497 -> 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
deleted file mode 100644
index af8cca2f5..000000000
--- a/perl-install/install/pixmaps/desktop-E17-big.png
+++ /dev/null
Binary files differ
diff --git a/perl-install/install/pixmaps/desktop-E17.png b/perl-install/install/pixmaps/desktop-E17.png
deleted file mode 100644
index 8d7640c8b..000000000
--- a/perl-install/install/pixmaps/desktop-E17.png
+++ /dev/null
Binary files differ
diff --git a/perl-install/install/pixmaps/desktop-LXDE-big.png b/perl-install/install/pixmaps/desktop-LXDE-big.png
deleted file mode 100644
index 92c14a60b..000000000
--- a/perl-install/install/pixmaps/desktop-LXDE-big.png
+++ /dev/null
Binary files differ
diff --git a/perl-install/install/pixmaps/desktop-LXDE.png b/perl-install/install/pixmaps/desktop-LXDE.png
deleted file mode 100644
index 39a9057e0..000000000
--- a/perl-install/install/pixmaps/desktop-LXDE.png
+++ /dev/null
Binary files differ
diff --git a/perl-install/install/pixmaps/desktop-MATE-big.png b/perl-install/install/pixmaps/desktop-MATE-big.png
deleted file mode 100644
index dfe2f73b9..000000000
--- a/perl-install/install/pixmaps/desktop-MATE-big.png
+++ /dev/null
Binary files differ
diff --git a/perl-install/install/pixmaps/desktop-MATE.png b/perl-install/install/pixmaps/desktop-MATE.png
deleted file mode 100644
index 5f4377180..000000000
--- a/perl-install/install/pixmaps/desktop-MATE.png
+++ /dev/null
Binary files differ
diff --git a/perl-install/install/pixmaps/desktop-RAZOR-big.png b/perl-install/install/pixmaps/desktop-RAZOR-big.png
deleted file mode 100644
index 2910b3488..000000000
--- a/perl-install/install/pixmaps/desktop-RAZOR-big.png
+++ /dev/null
Binary files differ
diff --git a/perl-install/install/pixmaps/desktop-RAZOR.png b/perl-install/install/pixmaps/desktop-RAZOR.png
deleted file mode 100644
index 65c7574cd..000000000
--- a/perl-install/install/pixmaps/desktop-RAZOR.png
+++ /dev/null
Binary files differ
diff --git a/perl-install/install/pixmaps/desktop-XFCE-big.png b/perl-install/install/pixmaps/desktop-XFCE-big.png
deleted file mode 100644
index 866305042..000000000
--- a/perl-install/install/pixmaps/desktop-XFCE-big.png
+++ /dev/null
Binary files differ
diff --git a/perl-install/install/pixmaps/desktop-XFCE.png b/perl-install/install/pixmaps/desktop-XFCE.png
deleted file mode 100644
index 40281e28e..000000000
--- a/perl-install/install/pixmaps/desktop-XFCE.png
+++ /dev/null
Binary files differ