Public Git Hosting - elinks.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: ad236a4 7e8e52d)

commit	5499926cc0b968ad617f37ea46229a88e0708a3f
author	Kalle Olavi Niemitalo <kon@iki.fi>
	Sun, 3 Feb 2008 20:22:00 +0000 (3 22:22 +0200)
committer	Kalle Olavi Niemitalo <Kalle@Astalo.kon.iki.fi>
	Sun, 3 Feb 2008 20:30:46 +0000 (3 22:30 +0200)
tree	f03755fd2a3afcb12f4ebd1cd38f15127beef509	tree \| snapshot (tar.gz zip)
parent	ad236a4ed94be931a415bc6e5ea1daf69762da42	commit \| diff
parent	7e8e52d33f415062cfdaa4c79a45087a47f7b665	commit \| diff

Merge branch 'elinks-0.12' into elinks-0.13

Conflicts:

po/pl.po
src/config/conf.c
src/terminal/kbd.c

12 files changed:

NEWS	diff1 \|	diff2 \|	blob \| history
src/config/conf.c	diff1 \|	diff2 \|	blob \| history
src/config/conf.h	diff1 \|	diff2 \|	blob \| history
src/config/options.c	diff1 \|	diff2 \|	blob \| history
src/config/options.h	diff1 \|	diff2 \|	blob \| history
src/config/opttypes.c	diff1 \|	diff2 \|	blob \| history
src/config/opttypes.h	diff1 \|	diff2 \|	blob \| history
src/intl/charsets.c	diff1 \|	diff2 \|	blob \| history
src/intl/charsets.h	diff1 \|	diff2 \|	blob \| history
src/intl/gettext/libintl.h	diff1 \|	diff2 \|	blob \| history
src/terminal/itrm.h	diff1 \|	diff2 \|	blob \| history
src/terminal/kbd.c	diff1 \|	diff2 \|	blob \| history

The ultimate text WWW browser