From 47320d3507aac21c8568cd244308e39a8869976a Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond Date: Tue, 29 Aug 2006 07:43:34 +0000 Subject: Fixed merge issues with respect to scrolling. --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 5f20fdb0..c60794b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-08-27 Guillaume Melquiond + + * 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 * src/gui/gui.cpp: Fixed crash when map is not loaded yet. -- cgit v1.2.3-60-g2f50