Merged conflict between upstream code reviewed branch and local changes.

This commit is contained in:
Ad5001 2021-10-01 18:24:21 +02:00
commit 10bc93306a
Signed by: Ad5001
GPG key ID: EF45F9C6AFE20160

View file

@ -1,12 +1,12 @@
{ {
"app-id": "eu.ad5001.LogarithmPlotter", "app-id": "eu.ad5001.LogarithmPlotter",
"runtime": "org.kde.Platform", "runtime": "org.kde.Platform",
"runtime-version": "5.15", "runtime-version": "5.15-21.08",
"sdk": "org.kde.Sdk", "sdk": "org.kde.Sdk",
"finish-args": [ "finish-args": [
"--share=ipc", "--share=ipc",
"--device=dri", "--device=dri",
"--socket=x11", "--socket=fallback-x11",
"--socket=wayland", "--socket=wayland",
"--talk-name=org.freedesktop.DBus.Proprieties", "--talk-name=org.freedesktop.DBus.Proprieties",
"--talk-name=org.freedesktop.IBus", "--talk-name=org.freedesktop.IBus",