summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-03-02 17:35:44 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-03-02 17:35:44 -0500
commit9372731c3ef1ac5f7ed59a85b071bde7b87d2460 (patch)
tree3122377a548140355ae1a3350212cc52827bc9ac /graphics
parent3716da5430a976d05afecdf82f43f14fc2584949 (diff)
parent043071ae12aa6854119a44304a5facbd58fa3624 (diff)
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'graphics')
-rw-r--r--graphics/easy_chat/scroll_indicator.png (renamed from graphics/misc/interview_arrow.png)bin160 -> 160 bytes
-rw-r--r--graphics/easy_chat/start_select_buttons.png (renamed from graphics/misc/interview_buttons.png)bin214 -> 214 bytes
-rw-r--r--graphics/easy_chat/triangle_cursor.png (renamed from graphics/misc/interview_triangle_cursor.png)bin147 -> 147 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/graphics/misc/interview_arrow.png b/graphics/easy_chat/scroll_indicator.png
index 1c1073d2f..1c1073d2f 100644
--- a/graphics/misc/interview_arrow.png
+++ b/graphics/easy_chat/scroll_indicator.png
Binary files differ
diff --git a/graphics/misc/interview_buttons.png b/graphics/easy_chat/start_select_buttons.png
index d6dfc7cbd..d6dfc7cbd 100644
--- a/graphics/misc/interview_buttons.png
+++ b/graphics/easy_chat/start_select_buttons.png
Binary files differ
diff --git a/graphics/misc/interview_triangle_cursor.png b/graphics/easy_chat/triangle_cursor.png
index a4a3f0bb1..a4a3f0bb1 100644
--- a/graphics/misc/interview_triangle_cursor.png
+++ b/graphics/easy_chat/triangle_cursor.png
Binary files differ