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

Conflicts:

	doc/man/man1/elinks.1.in
	doc/man/man5/elinks.conf.5

Resolved by regenerating the files with make update-man.

2008-06-08 20:47:36 +03:00

..

man1

Merge branch 'elinks-0.12' into elinks-0.13

2008-06-08 20:47:36 +03:00

man5

Merge branch 'elinks-0.12' into elinks-0.13

2008-06-08 20:47:36 +03:00

.gitignore

Do not .gitignore doc/man/man5/*.5, which are already in Git.

2008-05-03 20:27:16 +03:00

Makefile

path_to_top -> top_builddir

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