Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Frede Hundewadt 2019-02-27 11:03:50 +01:00
commit 0a8ecb14ce
No known key found for this signature in database
GPG Key ID: 7605992471F3F073
5 changed files with 7 additions and 5 deletions

View File

@ -11,6 +11,7 @@ avahi
binutils binutils
bison bison
>extra blueman >extra blueman
>extra bluez-utils
bmenu bmenu
>extra cantarell-fonts >extra cantarell-fonts
clipit clipit

View File

@ -1,7 +1,7 @@
git
KERNEL-broadcom-wl KERNEL-broadcom-wl
KERNEL-ndiswrapper KERNEL-ndiswrapper
KERNEL-r8168 KERNEL-r8168
#KERNEL-rt3562sta
KERNEL-virtualbox-guest-modules KERNEL-virtualbox-guest-modules
maia-console maia-console
manjaro-architect-launcher manjaro-architect-launcher

View File

@ -151,7 +151,7 @@ ms-office-online
>extra unace >extra unace
>extra lrzip >extra lrzip
>extra gtk3-print-backends >extra gtk3-print-backends
>extra libreoffice-fresh >extra libreoffice-still
>extra evolution >extra evolution
>extra lollypop >extra lollypop
>extra empathy >extra empathy

View File

@ -257,7 +257,8 @@ inxi
>extra firefox >extra firefox
>basic falkon >basic falkon
ms-office-online ms-office-online
>extra libreoffice-fresh #>extra libreoffice-fresh
>extra calligra
manjaro-hello manjaro-hello
manjaro-settings-manager-kcm manjaro-settings-manager-kcm
manjaro-settings-manager-knotifier manjaro-settings-manager-knotifier

View File

@ -1,4 +1,4 @@
calamares calamares-git
>manjaro grub-theme-live-manjaro >manjaro grub-theme-live-manjaro
gsmartcontrol gsmartcontrol
manjaro-architect manjaro-architect
@ -7,4 +7,4 @@ manjaro-live-systemd
mkinitcpio-nfs-utils mkinitcpio-nfs-utils
nbd nbd
squashfs-tools squashfs-tools
clonezilla clonezilla