Kalle Olavi Niemitalo
687f19dbde
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.
2009-01-01 19:14:01 +00:00
..
2005-11-15 11:33:27 +01:00
2007-07-27 13:10:50 +03:00
2006-06-14 14:41:59 +02:00
2007-07-27 14:14:00 +03:00
2007-09-14 11:49:03 +02:00
2005-10-21 09:14:07 +02:00
2008-11-01 22:20:25 +02:00
2008-01-26 17:53:14 +02:00
2005-10-21 09:14:07 +02:00
2009-01-01 16:17:03 +00:00
2008-10-26 16:13:38 +02:00
2007-07-27 13:10:50 +03:00
2005-11-15 11:33:27 +01:00
2007-07-27 13:10:50 +03:00
2007-07-27 13:10:50 +03:00
2008-10-26 16:13:38 +02:00
2008-10-26 16:13:38 +02:00
2008-03-29 18:41:22 +02:00
2007-07-31 13:47:12 +03:00
2007-07-27 14:14:00 +03:00
2007-07-27 14:14:00 +03:00
2007-07-29 12:55:25 +03:00
2008-05-25 18:44:21 +03:00
2007-07-27 13:10:50 +03:00
2007-07-31 13:47:12 +03:00
2007-07-27 13:10:50 +03:00
2007-07-27 13:10:50 +03:00
2007-01-02 21:25:20 +02:00
2007-09-14 15:12:32 +02:00
2005-11-15 11:33:27 +01:00
2007-07-27 13:10:50 +03:00
2007-07-31 13:47:12 +03:00
2007-09-14 15:14:34 +02:00
2008-11-09 20:04:02 +02:00
2008-05-25 18:44:21 +03:00
2008-11-01 22:39:17 +02:00
2008-11-01 22:39:17 +02:00
2007-09-14 15:12:32 +02:00
2007-07-27 13:10:50 +03:00
2005-10-21 09:14:07 +02:00
2006-01-21 08:44:19 +01:00
2005-10-21 09:14:07 +02:00
2005-11-15 11:33:27 +01:00
2008-11-02 22:15:38 +02:00
2008-11-02 22:15:38 +02:00
2007-08-28 20:34:17 +02:00
2007-07-27 14:14:00 +03:00
2007-07-27 14:14:00 +03:00