Merge branch 'Plasma/5.18'

paulmcauley · Jan 28, 2020 · 90e8f1d · 90e8f1d
2 parents 5819943 + 52159aa
commit 90e8f1d
Show file tree

Hide file tree

Showing 16 changed files with 1 addition and 0 deletions.
diff --git a/wallpapers/Next/contents/images/1024x768.jpg → wallpapers/Next/contents/images/1024x768.png b/wallpapers/Next/contents/images/1024x768.jpg → wallpapers/Next/contents/images/1024x768.png
diff --git a/...papers/Next/contents/images/1280x1024.jpg → ...papers/Next/contents/images/1280x1024.png b/...papers/Next/contents/images/1280x1024.jpg → ...papers/Next/contents/images/1280x1024.png
diff --git a/wallpapers/Next/contents/images/1280x800.jpg → wallpapers/Next/contents/images/1280x800.png b/wallpapers/Next/contents/images/1280x800.jpg → wallpapers/Next/contents/images/1280x800.png
diff --git a/wallpapers/Next/contents/images/1366x768.jpg → wallpapers/Next/contents/images/1366x768.png b/wallpapers/Next/contents/images/1366x768.jpg → wallpapers/Next/contents/images/1366x768.png
diff --git a/wallpapers/Next/contents/images/1440x900.jpg → wallpapers/Next/contents/images/1440x900.png b/wallpapers/Next/contents/images/1440x900.jpg → wallpapers/Next/contents/images/1440x900.png
diff --git a/...papers/Next/contents/images/1600x1200.jpg → ...papers/Next/contents/images/1600x1200.png b/...papers/Next/contents/images/1600x1200.jpg → ...papers/Next/contents/images/1600x1200.png
diff --git a/...papers/Next/contents/images/1680x1050.jpg → ...papers/Next/contents/images/1680x1050.png b/...papers/Next/contents/images/1680x1050.jpg → ...papers/Next/contents/images/1680x1050.png
diff --git a/...papers/Next/contents/images/1920x1080.jpg → ...papers/Next/contents/images/1920x1080.png b/...papers/Next/contents/images/1920x1080.jpg → ...papers/Next/contents/images/1920x1080.png
diff --git a/...papers/Next/contents/images/1920x1200.jpg → ...papers/Next/contents/images/1920x1200.png b/...papers/Next/contents/images/1920x1200.jpg → ...papers/Next/contents/images/1920x1200.png
diff --git a/...papers/Next/contents/images/2560x1440.jpg → ...papers/Next/contents/images/2560x1440.png b/...papers/Next/contents/images/2560x1440.jpg → ...papers/Next/contents/images/2560x1440.png
diff --git a/...papers/Next/contents/images/2560x1600.jpg → ...papers/Next/contents/images/2560x1600.png b/...papers/Next/contents/images/2560x1600.jpg → ...papers/Next/contents/images/2560x1600.png
diff --git a/...papers/Next/contents/images/3200x1800.jpg → ...papers/Next/contents/images/3200x1800.png b/...papers/Next/contents/images/3200x1800.jpg → ...papers/Next/contents/images/3200x1800.png
diff --git a/...papers/Next/contents/images/3200x2000.jpg → ...papers/Next/contents/images/3200x2000.png b/...papers/Next/contents/images/3200x2000.jpg → ...papers/Next/contents/images/3200x2000.png
diff --git a/...papers/Next/contents/images/3840x2160.jpg → ...papers/Next/contents/images/3840x2160.png b/...papers/Next/contents/images/3840x2160.jpg → ...papers/Next/contents/images/3840x2160.png
diff --git a/...papers/Next/contents/images/5120x2880.jpg → ...papers/Next/contents/images/5120x2880.png b/...papers/Next/contents/images/5120x2880.jpg → ...papers/Next/contents/images/5120x2880.png
diff --git a/wallpapers/Next/contents/images/README b/wallpapers/Next/contents/images/README
@@ -0,0 +1 @@
+These images are actually JPEGs, not PNGs. This is done because changing the filetype of the wallpaper is problematic due to the issue described in https://phabricator.kde.org/T12611. I'm sorry. :/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		These images are actually JPEGs, not PNGs. This is done because changing the filetype of the wallpaper is problematic due to the issue described in https://phabricator.kde.org/T12611. I'm sorry. :/