| commit | b40736cafe8d1253fcc8632581a0b78ac1e621d7 | |
| author | Kalle Olavi Niemitalo <kon@iki.fi> | |
| Sat, 27 Sep 2008 13:28:28 +0000 (27 16:28 +0300) | ||
| committer | Kalle Olavi Niemitalo <Kalle@Astalo.kon.iki.fi> | |
| Sat, 27 Sep 2008 13:28:28 +0000 (27 16:28 +0300) | ||
| tree | 5e581c81817573f28d785102793bb7ebae6bf871 | treesnapshot (tar.gz zip) |
| parent | 0f6add14f263a032d9ad2e6060d5971c24777e59 | commitdiff |
| parent | 58ebb4447b59a07c780184ee573c66354c7e4be3 | commitdiff |
Merge branch 'elinks-0.12' into elinks-0.13
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/fr.po (kept 0.13.GIT version)
po/pl.po (kept 0.13.GIT version)
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/fr.po (kept 0.13.GIT version)
po/pl.po (kept 0.13.GIT version)