Merge branch 'elinks-0.12' into elinks-0.13
commit814e67273608e797cc46e1abfe053d6a84cc42d7
authorKalle Olavi Niemitalo <kon@iki.fi>
Mon, 4 Feb 2008 21:51:42 +0000 (4 23:51 +0200)
committerKalle Olavi Niemitalo <Kalle@Astalo.kon.iki.fi>
Mon, 4 Feb 2008 21:51:42 +0000 (4 23:51 +0200)
tree51cddd2542412baf35a1075734cbbebc15110d6d
parent5499926cc0b968ad617f37ea46229a88e0708a3f
parenta3d093bd250c91945d943c94212441128a56c97a
Merge branch 'elinks-0.12' into elinks-0.13

Conflicts:

src/osdep/osdep.c
NEWS
doc/Doxyfile.in