Merge branch 'elinks-0.12' into elinks-0.13
commitfb966b87a37e203c3f22d00fd8a0ff85829a85fa
authorKalle Olavi Niemitalo <kon@iki.fi>
Sat, 15 Mar 2008 17:24:51 +0000 (15 19:24 +0200)
committerKalle Olavi Niemitalo <Kalle@Astalo.kon.iki.fi>
Sat, 15 Mar 2008 17:24:51 +0000 (15 19:24 +0200)
tree4f5fac18f426047d61504e57c087f942e2802aae
parent4ea9f1f0bb95226d4e99ca83f43ead6fd3c3ed4a
parentdafb726a49251a8d006fe46687d8d4f3cf082f97
Merge branch 'elinks-0.12' into elinks-0.13

Conflicts:

doc/Doxyfile.in
src/mime/backend/default.c
src/protocol/smb/smb2.c
src/session/download.c