Public Git Hosting - elinks/elinks-j605.git/commit

commit	ef548e5728785258c5a978ff7736d09e6e862bfa
author	Kalle Olavi Niemitalo <kon@iki.fi>
	Fri, 24 Jul 2009 15:32:25 +0000 (24 18:32 +0300)
committer	Kalle Olavi Niemitalo <Kalle@Astalo.kon.iki.fi>
	Fri, 24 Jul 2009 15:32:25 +0000 (24 18:32 +0300)
tree	a4bcdc802d4420a025f8b288c325200163997cbb	tree \| snapshot (tar.gz zip)
parent	b6a3f28c49f735bb28d72bed2cfe82887193d682	commit \| diff
parent	db128fecd9e512bf61481511a0119f6f00bb2b3f	commit \| diff

Merge branch 'elinks-0.12'

Conflicts:
src/session/download.c
src/session/download.h
src/viewer/text/view.c

doc/Doxyfile.in	diff1 \|	diff2 \|	blob \| history
src/bfu/button.h	diff1 \|	diff2 \|	blob \| history
src/config/dialogs.c	diff1 \|	diff2 \|	blob \| history
src/config/kbdbind.c	diff1 \|	diff2 \|	blob \| history
src/network/state.h	diff1 \|	diff2 \|	blob \| history
src/protocol/bittorrent/common.h	diff1 \|	diff2 \|	blob \| history
src/protocol/bittorrent/dialogs.c	diff1 \|	diff2 \|	blob \| history
src/session/download.c	diff1 \|	diff2 \|	blob \| history
src/session/download.h	diff1 \|	diff2 \|	blob \| history
src/session/session.h	diff1 \|	diff2 \|	blob \| history
src/viewer/text/view.c	diff1 \|	diff2 \|	blob \| history

doc/Doxyfile.in	diff1 \|	diff2 \|	blob \| history
src/bfu/button.h	diff1 \|	diff2 \|	blob \| history
src/config/dialogs.c	diff1 \|	diff2 \|	blob \| history
src/config/kbdbind.c	diff1 \|	diff2 \|	blob \| history
src/network/state.h	diff1 \|	diff2 \|	blob \| history
src/protocol/bittorrent/common.h	diff1 \|	diff2 \|	blob \| history
src/protocol/bittorrent/dialogs.c	diff1 \|	diff2 \|	blob \| history
src/session/download.c	diff1 \|	diff2 \|	blob \| history
src/session/download.h	diff1 \|	diff2 \|	blob \| history
src/session/session.h	diff1 \|	diff2 \|	blob \| history
src/viewer/text/view.c	diff1 \|	diff2 \|	blob \| history