summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2014-11-14 14:36:47 +0100
committerSebastian Geerken <devnull@localhost>2014-11-14 14:36:47 +0100
commited41bc460ab98bbcd05ce1e63b7aad418082b0be (patch)
tree0e346fdfd2f80b860c40f9854e720a4d6c47dd92
parentd8c89bded3b3b0be3d42fdd71e48ec1ac21513ad (diff)
parentdcba927ada3bf7a373758efe0c50f39f0f92da0d (diff)
Merge.
-rw-r--r--ChangeLog1
-rw-r--r--test/dw_simple_container.hh2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 028fad1b..f226bb49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ dillo-3.1 [not released yet]
- Make building of test/ files more robust.
- Fix Makefile to pick up LIBJPEG_CPPFLAGS.
- Work on collapsing spaces: more cases supported.
+ - Fix crash that's possible searching for text while page still being built.
Patches: Sebastian Geerken
+- Image buffer/cache improvements.
Patch: Jorge Arellano Cid
diff --git a/test/dw_simple_container.hh b/test/dw_simple_container.hh
index bb1a37af..fdb67bec 100644
--- a/test/dw_simple_container.hh
+++ b/test/dw_simple_container.hh
@@ -1,5 +1,5 @@
#ifndef __DW_SIMPLE_CONTAINER_HH__
-#define __DWR_SIMPLE_CONTAINER_HH__
+#define __DW_SIMPLE_CONTAINER_HH__
#include "dw/core.hh"