aboutsummaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-03-01 08:43:56 -0500
committerClyne Sullivan <tullivan99@gmail.com>2016-03-01 08:43:56 -0500
commit47f8aa5b312a5ef671e83322bcbe201a034f84c0 (patch)
tree8dccb7228c407e01024752b48dae7150b6b349e5 /Changelog
parent32cb1880f018fc149d1c8a71a83426a8f5a92a6a (diff)
parent883b348abac73d6c2b1d4ea8b65caccf0767e5a8 (diff)
merge with remake
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index 9a9b927..0384181 100644
--- a/Changelog
+++ b/Changelog
@@ -706,3 +706,9 @@
- considered more formal coding? (as in documentation and indentation)
- fixed dialog boxes and options
- broke screenshots
+
+3/1/2016:
+=========
+
+ - merged 'remake' with 'master', fixed font issues and world stuffs
+ - continued work on merchant dialog