| commit | bff789d421bd0ef9741243ca2f70d26bca5e2ee0 | |
| author | Kalle Olavi Niemitalo <kon@iki.fi> | |
| Sat, 8 Mar 2008 13:14:20 +0000 (8 15:14 +0200) | ||
| committer | Kalle Olavi Niemitalo <Kalle@Astalo.kon.iki.fi> | |
| Sat, 8 Mar 2008 13:35:12 +0000 (8 15:35 +0200) | ||
| tree | 0b3898c3bc3893fc2099520ecb77ccd585dfd2e4 | treesnapshot (tar.gz zip) |
| parent | 3a9b5d091d80d224b4bf93e0dd38d1c5b1a0797f | commitdiff |
| parent | 5fcf1759637e5dec583e293e24f384f408bad36d | commitdiff |
Merge branch 'elinks-0.12' into elinks-0.13
Conflicts:
doc/elinks.conf.5.txt
src/mime/dialogs.c (resolved by Witold Filipczyk)
Conflicts:
doc/elinks.conf.5.txt
src/mime/dialogs.c (resolved by Witold Filipczyk)
| NEWS | diff1 | diff2 | blobhistory |
| src/mime/dialogs.c | diff1 | diff2 | blobhistory |
| src/protocol/http/http.c | diff1 | diff2 | blobhistory |
| src/protocol/rewrite/rewrite.c | diff1 | diff2 | blobhistory |