Merge remote-tracking branch 'upstream/master'

This commit is contained in:
fhdk 2018-04-27 11:57:25 +02:00
commit dcff2bc1fd
6 changed files with 5 additions and 3 deletions

View File

@ -76,6 +76,7 @@ ffmpegthumbnailer
speedtest-cli
sterminal
terminus-font
testdisk
thermald
tree
w3m

View File

@ -87,6 +87,7 @@ rofi-scripts
rootmenu
sxhkd
terminus-font
testdisk
thermald
xcape
xdg-su

View File

@ -85,6 +85,7 @@ speedtest-cli
sterminal
sxhkd
terminus-font
testdisk
thermald
tree
udevil

View File

@ -121,7 +121,6 @@ syslog-ng
terminus-font
tree
>extra ttf-bitstream-vera
>extra ttf-dejavu
>extra ttf-droid
>extra ttf-inconsolata
>extra ttf-indic-otf

View File

@ -73,7 +73,7 @@ manjaro-artwork
manjaro-wallpapers-17.0
manjaro-browser-settings
manjaro-settings-manager-notifier
manjaro-gnome-settings
manjaro-gnome-assets
manjaro-hotfixes
manjaro-pulse
manjaro-hello

View File

@ -264,5 +264,5 @@ xdg-su
## Misc
manjaro-hotfixes
vibrancy-colors
vibrancy-icons-teal