Merge branch 'master' of github.com:manjaro/iso-profiles

2017-03-07 16:16:21 +01:00 · 2017-03-07 16:16:21 +01:00 · 6bc678c0b9
parent ce5993f1dc 1f7e32901a
commit 6bc678c0b9
2 changed files with 4 additions and 4 deletions
--- a/manjaro/lxqt/Packages-Desktop
+++ b/manjaro/lxqt/Packages-Desktop
@ -5,8 +5,6 @@ compton-conf
 dmidecode
 >extra lximage-qt
 >extra manjaro-lxqt-extra-settings
->extra octopi
->extra octopi-notifier-qt5
 >extra octopi-cachecleaner
 >extra octopi-repoeditor
 >extra vlc
@ -52,6 +50,8 @@ openbox
 pcmanfm-qt
 powertop
 qterminal
+octopi
+octopi-notifier-qt5
 qupzilla
 sddm-qt-manjaro-theme
 >systemd alsa-utils
--- a/manjaro/lxqt/Packages-Live
+++ b/manjaro/lxqt/Packages-Live
@ -1,6 +1,6 @@

-calamares
-#calamares-dev
+#calamares
+calamares-dev
 >sonar sonar-calamares-branding

 KERNEL-broadcom-wl