Merge remote-tracking branch 'upstream/master'

This commit is contained in:
fhdk 2018-05-16 14:11:58 +02:00
commit e48b76a921

View file

@ -179,7 +179,7 @@ xfce4-xkb-plugin
xfce4-pulseaudio-plugin xfce4-pulseaudio-plugin
pavucontrol pavucontrol
## Themes QT/GTK/SDDM ## Themes
>extra manjaro-wallpapers-18.0 >extra manjaro-wallpapers-18.0
gnome-icon-theme gnome-icon-theme
gnome-themes-standard gnome-themes-standard
@ -194,6 +194,7 @@ engrampa-thunar-plugin
>extra firefox >extra firefox
# >extra flashplugin # >extra flashplugin
>extra galculator-gtk2 >extra galculator-gtk2
gcolor2
>extra gimp >extra gimp
gparted gparted
gufw gufw
@ -214,6 +215,7 @@ mugshot
>basic parole # media player >basic parole # media player
>extra pidgin >extra pidgin
powertop powertop
screenfetch
>extra poppler-data # CKJ support for pdf >extra poppler-data # CKJ support for pdf
>basic sylpheed # mail client >basic sylpheed # mail client
>extra thunderbird >extra thunderbird