summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2006-08-29 07:43:34 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2006-08-29 07:43:34 +0000
commit47320d3507aac21c8568cd244308e39a8869976a (patch)
treed209af8c5f82cde5149a6b10c8c214933b728d6a /ChangeLog
parent391203d83ed7a72b54fb7d7c72dbe35db14f0ea9 (diff)
downloadmana-47320d3507aac21c8568cd244308e39a8869976a.tar.gz
mana-47320d3507aac21c8568cd244308e39a8869976a.tar.bz2
mana-47320d3507aac21c8568cd244308e39a8869976a.tar.xz
mana-47320d3507aac21c8568cd244308e39a8869976a.zip
Fixed merge issues with respect to scrolling.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f20fdb0..c60794b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-27 Guillaume Melquiond <guillaume.melquiond@gmail.com>
+
+ * src/engine.cpp, src/gui/gui.cpp: Fixed merge issues: printfs and
+ inconsistency between view and camera variables. Fixed lazy scrolling:
+ there is no "freaking out" when the correct function is used.
+
2006-08-28 Bjørn Lindeijer <bjorn@lindeijer.nl>
* src/gui/gui.cpp: Fixed crash when map is not loaded yet.