Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Frede Hundewadt 2018-11-26 08:18:15 +01:00
commit 3bcf78b27b
No known key found for this signature in database
GPG Key ID: 7605992471F3F073
5 changed files with 27 additions and 0 deletions

View File

@ -0,0 +1 @@
../../../../shared/manjaro/live-overlay/usr/share

View File

@ -0,0 +1 @@
../../../shared/manjaro/live-overlay/usr

View File

@ -0,0 +1 @@
../../../shared/manjaro/live-overlay/usr

View File

@ -31,6 +31,7 @@ open-vm-tools
pangox-compat
primus
bumblebee
virtualbox-guest-utils
vulkan-radeon
>multilib lib32-vulkan-radeon
vulkan-intel

View File

@ -0,0 +1,23 @@
---
componentName: manjaro
strings:
productName: Manjaro Linux
shortProductName: Manjaro
version: 18.0.1-rc1
shortVersion: 18.0.1-rc1
versionedName: Manjaro Linux 18.0.1-rc1 "Illyria"
shortVersionedName: Manjaro 18.0.1-rc1
bootloaderEntryName: Manjaro
images:
productLogo: "logo.png"
productIcon: "logo.png"
productWelcome: "languages.png"
slideshow: "show.qml"
style:
sidebarBackground: "#454948"
sidebarText: "#efefef"
sidebarTextSelect: "#9E4F5D"