Merge commit 'pasky.or.cz/elinks-0.12' into elinks-0.13
commit2437d35904a0a0ecf977bd8e7a1a5c6591b9be80
authorKalle Olavi Niemitalo <kon@iki.fi>
Sat, 28 Jul 2007 00:22:29 +0000 (28 03:22 +0300)
committerKalle Olavi Niemitalo <Kalle@Astalo.kon.iki.fi>
Sat, 28 Jul 2007 00:22:29 +0000 (28 03:22 +0300)
tree47cf68fc4b33526ab380a4645d0a22408d3b0223
parentab9e0821d664920ac53ce12dc5e8ea39c8c800b1
parent297ad024c3afed6fbf172ceadeb9a80d5615d7cd
Merge commit 'pasky.or.cz/elinks-0.12' into elinks-0.13

There were conflicts in src/document/css/ because 0.12.GIT switched
to LIST_OF(struct css_selector) and 0.13.GIT switched to struct
css_selector_set.  Resolved by using LIST_OF(struct css_selector)
inside struct css_selector_set.
16 files changed:
src/Doxyfile
src/cookies/cookies.c
src/document/css/apply.c
src/document/css/css.c
src/document/css/parser.c
src/document/css/stylesheet.c
src/document/css/stylesheet.h
src/document/html/renderer.c
src/dom/Doxyfile
src/ecmascript/ecmascript.h
src/protocol/bittorrent/common.c
src/protocol/bittorrent/common.h
src/terminal/draw.c
src/util/box.h
src/util/memlist.c
src/util/secsave.c