Elias Steurer 4504f06eb1 Merge branch 'master' into qt6-support ... # Conflicts: # CMakeLists.txt # ScreenPlay/app.h # ScreenPlay/main.cpp # ScreenPlay/main.qml # ScreenPlay/qml/Navigation/Navigation.qml # ScreenPlay/src/settings.h # ScreenPlay/translations/ScreenPlay_zh_cn.qm # ScreenPlayWallpaper/CMakeLists.txt # ScreenPlayWallpaper/SPWResources.qrc # ScreenPlayWallpaper/qml/Wallpaper.qml		2021-09-10 11:09:38 +02:00
..
CMakeLists.txt	Merge branch 'master' into qt6-support	2021-09-10 11:09:38 +02:00
cpu.cpp	Add more docs	2021-05-13 13:35:54 +02:00
cpu.h	Call format-cpp	2020-10-29 19:17:37 +01:00
gpu.cpp	Add more docs	2021-05-13 13:35:54 +02:00
gpu.h	Add GPU Sysinfo	2021-05-12 17:09:24 +02:00
mathhelper.h	Call format-cpp	2020-10-29 19:17:37 +01:00
qmldir	Cleanup	2019-06-10 16:27:17 +02:00
ram.cpp	Formatting	2021-05-16 14:19:29 +02:00
ram.h	Add uptime to sysinfo	2021-02-13 20:14:10 +01:00
screenplaysysinfo_plugin.cpp	Call format-cpp	2020-10-29 19:17:37 +01:00
screenplaysysinfo_plugin.h	Call format-cpp	2020-10-29 19:17:37 +01:00
storage.cpp	Add more docs	2021-05-13 13:35:54 +02:00
storage.h	Call format-cpp	2020-10-29 19:17:37 +01:00
sysinfo.cpp	Add more docs	2021-05-13 13:35:54 +02:00
sysinfo.h	Add GPU Sysinfo	2021-05-12 17:09:24 +02:00
uptime.cpp	Add more docs	2021-05-13 13:35:54 +02:00
uptime.h	Add uptime to sysinfo	2021-02-13 20:14:10 +01:00