Merge remote-tracking branch 'origin/master'

# Conflicts: # res/shapes/shapes_1.bmp # res/shapes/shapes_2.bmp # res/shapes/shapes_3.bmp # res/shapes/shapes_4.bmp # res/shapes/shapes_5.bmp # res/shapes/shapes_6.bmp
2020-03-09 19:20:02 +01:00
parent 2a608f7566 6b9696c98e
commit 88764ca58e
24 changed files with 156 additions and 174 deletions
--- a/res/shapes/shapes_1.bmp
+++ b/res/shapes/shapes_1.bmp
--- a/res/shapes/shapes_2.bmp
+++ b/res/shapes/shapes_2.bmp
--- a/res/shapes/shapes_3.bmp
+++ b/res/shapes/shapes_3.bmp
--- a/res/shapes/shapes_3.png
+++ b/res/shapes/shapes_3.png
--- a/res/shapes/shapes_4.bmp
+++ b/res/shapes/shapes_4.bmp
--- a/res/shapes/shapes_5.bmp
+++ b/res/shapes/shapes_5.bmp
--- a/res/shapes/shapes_6.bmp
+++ b/res/shapes/shapes_6.bmp