Merge remote-tracking branch 'origin/kathi'

1 year ago · 03d130cde6
parent d1d78adf00 6a115d6229
commit 03d130cde6
12 changed files with 0 additions and 0 deletions
--- a/Assets/Art/.outdoor_background_color_I.png-autosave.kra
+++ b/Assets/Art/.outdoor_background_color_I.png-autosave.kra
--- a/Assets/Art/Indoor-background.png
+++ b/Assets/Art/Indoor-background.png
--- a/Assets/Art/Indoor-background.psd
+++ b/Assets/Art/Indoor-background.psd
--- a/Assets/Art/Startscreen_grey.png
+++ b/Assets/Art/Startscreen_grey.png
--- a/Assets/Art/Startscreen_grey.psd
+++ b/Assets/Art/Startscreen_grey.psd
--- a/Assets/Art/Startscreen_grey.psd~
+++ b/Assets/Art/Startscreen_grey.psd~
--- a/Assets/Art/outdoor_background.psd
+++ b/Assets/Art/outdoor_background.psd
--- a/Assets/Art/outdoor_background_color_I.png
+++ b/Assets/Art/outdoor_background_color_I.png
--- a/Assets/Art/outdoor_background_color_I.png~
+++ b/Assets/Art/outdoor_background_color_I.png~
--- a/Assets/Art/outdoor_background_color_II.png
+++ b/Assets/Art/outdoor_background_color_II.png
--- a/Assets/Art/outdoor_background_grey.png
+++ b/Assets/Art/outdoor_background_grey.png
--- a/Assets/Art/outdoor_background_grey.psd
+++ b/Assets/Art/outdoor_background_grey.psd