| commit | 687f19dbdea90a5db6cc4826f0ffe60c6ca72b18 | |
| author | Kalle Olavi Niemitalo <kon@iki.fi> | |
| Thu, 1 Jan 2009 18:47:43 +0000 (1 18:47 +0000) | ||
| committer | Kalle Olavi Niemitalo <Kalle@Astalo.kon.iki.fi> | |
| Thu, 1 Jan 2009 19:14:01 +0000 (1 19:14 +0000) | ||
| tree | 9eac21047e664954785bc368e1d2328f72fd73f9 | treesnapshot (tar.gz zip) |
| parent | b9b2b75f73ee8bb9ab361d22d3ba3579185cdfea | commitdiff |
| parent | 29c34df62e086c19b24ad34ec927d99f5998212d | commitdiff |
Merge branch 'elinks-0.12' into elinks-0.13
Conflicts:
src/bfu/dialog.c
src/bfu/hotkey.c
src/bfu/inpfield.c
src/dialogs/options.c
src/document/renderer.c
src/intl/gettext/libintl.h
src/protocol/http/codes.c
src/session/task.c
src/terminal/event.c
src/terminal/terminal.h
src/viewer/text/form.c
src/viewer/text/link.c
And a semantic conflict in src/terminal/terminal.c.
Conflicts:
src/bfu/dialog.c
src/bfu/hotkey.c
src/bfu/inpfield.c
src/dialogs/options.c
src/document/renderer.c
src/intl/gettext/libintl.h
src/protocol/http/codes.c
src/session/task.c
src/terminal/event.c
src/terminal/terminal.h
src/viewer/text/form.c
src/viewer/text/link.c
And a semantic conflict in src/terminal/terminal.c.
20 files changed: