Public Git Hosting - elinks.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 228595f a831beb)

commit	4138b401ca1ce0d8148340acee8b1a0eaf8187c8
author	Kalle Olavi Niemitalo <kon@iki.fi>
	Sat, 26 Jan 2008 16:15:33 +0000 (26 18:15 +0200)
committer	Kalle Olavi Niemitalo <Kalle@Astalo.kon.iki.fi>
	Sat, 26 Jan 2008 16:15:33 +0000 (26 18:15 +0200)
tree	fa755596148a9f43fb80840a6dabe876cdfa9608	tree \| snapshot (tar.gz zip)
parent	228595ff29439ccb72c5c248c15626cbafb04ab7	commit \| diff
parent	a831beb6c80957606967d8f34b9046ed8178a0b2	commit \| diff

Merge branch 'elinks-0.12' into elinks-0.13

Conflicts:

src/document/css/stylesheet.c
src/document/css/stylesheet.h

NEWS	diff1 \|	diff2 \|	blob \| history
src/document/css/css.c	diff1 \|	diff2 \|	blob \| history
src/document/css/stylesheet.c	diff1 \|	diff2 \|	blob \| history
src/document/css/stylesheet.h	diff1 \|	diff2 \|	blob \| history
src/document/css/value.c	diff1 \|	diff2 \|	blob \| history
src/document/html/parser.c	diff1 \|	diff2 \|	blob \| history
src/protocol/bittorrent/piececache.c	diff1 \|	diff2 \|	blob \| history

The ultimate text WWW browser