Kalle Olavi Niemitalo 34f8f6a58f Merge branch 'elinks-0.12' into master ... Conflicts: NEWS (merged) configure.in (merged) doc/man/man1/elinks.1.in (regenerated) doc/man/man5/elinks.conf.5 (regenerated) doc/man/man5/elinkskeys.5 (regenerated) po/af.po (used elinks-0.12) po/be.po (used elinks-0.12) po/bg.po (used elinks-0.12) po/ca.po (used elinks-0.12) po/cs.po (used elinks-0.12) po/da.po (used elinks-0.12) po/de.po (used elinks-0.12) po/el.po (used elinks-0.12) po/es.po (used elinks-0.12) po/et.po (used elinks-0.12) po/fi.po (used elinks-0.12) po/fr.po (used master) po/gl.po (used elinks-0.12) po/hr.po (used elinks-0.12) po/hu.po (used elinks-0.12) po/id.po (used elinks-0.12) po/is.po (used elinks-0.12) po/it.po (used elinks-0.12) po/lt.po (used elinks-0.12) po/nb.po (used elinks-0.12) po/nl.po (used elinks-0.12) po/pl.po (used master) po/pt.po (used elinks-0.12) po/pt_BR.po (used elinks-0.12) po/ro.po (used elinks-0.12) po/ru.po (used elinks-0.12) po/sk.po (used elinks-0.12) po/sr.po (used elinks-0.12) po/sv.po (used elinks-0.12) po/tr.po (used elinks-0.12) po/uk.po (used elinks-0.12)		2009-03-29 18:26:20 +03:00
..
man1	Merge branch 'elinks-0.12' into master	2009-03-29 18:26:20 +03:00
man5	Merge branch 'elinks-0.12' into master	2009-03-29 18:26:20 +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