Merge branch 'v18.0' of ssh://gitlab.manjaro.org:22277/profiles-and-settings/iso-profiles into v18.0

This commit is contained in:
Bernhard Landauer 2018-11-28 14:24:10 +01:00
commit d47b48759d
3 changed files with 6 additions and 4 deletions

View file

@ -66,7 +66,6 @@ lightdm-slick-greeter
libappindicator-gtk3 libappindicator-gtk3
accountsservice # Enhanced user accounts accountsservice # Enhanced user accounts
python-dbus python-dbus
compton
gnome-keyring gnome-keyring
grub-theme-manjaro grub-theme-manjaro
light-locker light-locker
@ -133,6 +132,8 @@ zathura-djvu
################################### ###################################
## Extra Misc and Apps ## Extra Misc and Apps
################################### ###################################
>extra bmenu
>extra compton
>extra compton-conf >extra compton-conf
>extra gimp >extra gimp
>extra gufw >extra gufw
@ -140,6 +141,7 @@ zathura-djvu
>extra mpv >extra mpv
>extra thunderbird >extra thunderbird
>extra transmission-gtk >extra transmission-gtk
>extra manjaro-settings-samba
>extra thunar-shares-plugin-gtk3 >extra thunar-shares-plugin-gtk3
>extra blueman >extra blueman
>extra pulseaudio-bluetooth >extra pulseaudio-bluetooth

View file

@ -12,7 +12,8 @@ lightdm-slick-greeter
lightdm-settings lightdm-settings
grub-theme-manjaro grub-theme-manjaro
mate-wallpapers mate-wallpapers
manjaro-wallpapers-17.0 manjaro-wallpapers-18.0
wallpapers-2018
mate-icon-theme mate-icon-theme
papirus-maia-icon-theme papirus-maia-icon-theme
xcursor-breeze xcursor-breeze
@ -36,6 +37,7 @@ mozo
gnome-disk-utility gnome-disk-utility
gnome-keyring gnome-keyring
manjaro-mate-settings manjaro-mate-settings
manjaro-application-utility
mc # Midnight Commander mc # Midnight Commander
pacui pacui
mhwd-tui mhwd-tui

View file

@ -162,11 +162,9 @@ ms-office-online
>extra manjaro-documentation-en >extra manjaro-documentation-en
>extra jre8-openjdk >extra jre8-openjdk
>extra jre8-openjdk-headless >extra jre8-openjdk-headless
#>extra flashplugin
>extra libdvdcss >extra libdvdcss
>extra steam-manjaro >extra steam-manjaro
>extra manjaro-printer >extra manjaro-printer
>extra blueman
>extra ffmpegthumbnailer >extra ffmpegthumbnailer
>extra timeshift >extra timeshift
>extra kernel-alive >extra kernel-alive