diff options
author | Sebastian Geerken <devnull@localhost> | 2014-11-14 14:36:47 +0100 |
---|---|---|
committer | Sebastian Geerken <devnull@localhost> | 2014-11-14 14:36:47 +0100 |
commit | ed41bc460ab98bbcd05ce1e63b7aad418082b0be (patch) | |
tree | 0e346fdfd2f80b860c40f9854e720a4d6c47dd92 | |
parent | d8c89bded3b3b0be3d42fdd71e48ec1ac21513ad (diff) | |
parent | dcba927ada3bf7a373758efe0c50f39f0f92da0d (diff) |
Merge.
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | test/dw_simple_container.hh | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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" |