Kalle Olavi Niemitalo 988cec481b Merge branch 'elinks-0.12' into elinks-0.13 ...

Conflicts:

	NEWS
	configure.in

The following files also conflicted, but they had not been manually
edited in the elinks-0.12 branch after the previous merge, so I just
kept the 0.13.GIT versions:

	doc/man/man1/elinks.1.in
	doc/man/man5/elinks.conf.5
	doc/man/man5/elinkskeys.5
	po/fr.po
	po/pl.po

2008-07-11 22:28:45 +03:00

..

cache.c

Merge branch 'elinks-0.12' into elinks-0.13

2008-07-11 22:28:45 +03:00

cache.h

Merge branch 'elinks-0.12' into elinks-0.13

2008-07-11 22:28:45 +03:00

dialogs.c

bug 1009: id variables renamed, added document_id to the document.

2008-04-27 23:22:08 +03:00

dialogs.h

Remove empty lines in start of header files

2005-11-15 11:33:27 +01:00

Makefile

path_to_top -> top_builddir

2005-10-20 04:00:35 +02:00