Merge remote-tracking branch 'upstream/master'

This commit is contained in:
fhdk 2018-04-19 13:08:38 +02:00
commit 1e259ee80e
6 changed files with 6 additions and 8 deletions

View File

@ -62,7 +62,7 @@ m4
make
manjaro-alsa
manjaro-browser-settings
manjaro-cinnamon-settings
manjaro-cinnamon-settings-dev
>extra manjaro-documentation-en
manjaro-hello
manjaro-hotfixes
@ -94,7 +94,6 @@ openssh
>extra openvpn
>extra p7zip
pamac
papirus-maia-icon-theme # move to settings depends with 18.0
>extra parcellite
patch
>extra patchutils

View File

@ -70,7 +70,7 @@ make
manjaro-browser-settings
manjaro-hello
manjaro-hotfixes
manjaro-i3-settings
manjaro-i3-settings-dev
>extra manjaro-printer
manjaro-settings-manager-notifier
>extra markdown_previewer
@ -99,7 +99,6 @@ openssh
>extra p7zip
palemoon-bin
pamac
papirus-maia-icon-theme # move to settings depends with 18.0
patch
patchutils
pcmanfm

View File

@ -5,7 +5,7 @@ calamares
KERNEL-broadcom-wl
KERNEL-ndiswrapper
KERNEL-r8168
KERNEL-rt3562sta
#KERNEL-rt3562sta
KERNEL-virtualbox-guest-modules
>manjaro grub-theme-live-manjaro

View File

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

View File

@ -3,7 +3,7 @@ feh
fluxbox-theme-vertex-maia
KERNEL-broadcom-wl
KERNEL-r8168
KERNEL-rt3562sta
#KERNEL-rt3562sta
KERNEL-virtualbox-guest-modules
manjaro-hotfixes
manjaro-live-skel

View File

@ -2,7 +2,7 @@ calamares-git
KERNEL-bbswitch
KERNEL-broadcom-wl
KERNEL-r8168
KERNEL-rt3562sta
#KERNEL-rt3562sta
manjaro-live-skel
mkinitcpio-nfs-utils
>multilib lib32-libxvmc