Merge remote-tracking branch 'upstream/master'

This commit is contained in:
fhdk 2018-07-26 11:11:17 +02:00
commit c3d7222314
2 changed files with 4 additions and 4 deletions

View File

@ -43,7 +43,7 @@ disable_systemd=('pacman-init')
# '/etc/defaults/useradd': " " # '/etc/defaults/useradd': " "
# userShell : "/bin/zsh" # userShell : "/bin/zsh"
# empty value will not be used # empty value will not be used
user_shell="/bin/zsh" # user_shell="/bin/zsh"
################# livecd ################# ################# livecd #################
@ -58,7 +58,7 @@ hostname="manjaro-lxqt"
# the login shell # the login shell
# defaults to bash # defaults to bash
login_shell=/bin/zsh # login_shell=/bin/zsh
# unset defaults to given values # unset defaults to given values
addgroups="video,audio,power,storage,optical,network,lp,scanner,wheel" addgroups="video,audio,power,storage,optical,network,lp,scanner,wheel"

View File

@ -271,8 +271,8 @@ yakuake
manjaro-documentation-en manjaro-documentation-en
## Settings packages ## Settings packages
>extra manjaro-kde-settings >extra manjaro-kde-settings-18.0
>basic manjaro-kde-minimal-settings >basic manjaro-kde-minimal-settings-18.0
manjaro-browser-settings manjaro-browser-settings
## Xorg Input Drivers ## Xorg Input Drivers