| commit | 988cec481bd8e0e41b2c7bd717a3d9af215f00e2 | |
| author | Kalle Olavi Niemitalo <kon@iki.fi> | |
| Fri, 11 Jul 2008 19:28:45 +0000 (11 22:28 +0300) | ||
| committer | Kalle Olavi Niemitalo <Kalle@Astalo.kon.iki.fi> | |
| Fri, 11 Jul 2008 19:28:45 +0000 (11 22:28 +0300) | ||
| tree | efeeb0c646bf17a62dae5dacd4c51cf384978f99 | treesnapshot (tar.gz zip) |
| parent | 1ab55c27a4683d56af2c112bfc1c8321b5460fec | commitdiff |
| parent | 12bb8fdfe77f5fd6850f288c0ed312ac96c4d1ee | commitdiff |
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
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
13 files changed: