1
0
mirror of https://github.com/rkd77/elinks.git synced 2025-02-02 15:09:23 -05:00
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
..
2007-07-27 18:33:33 +03:00
2007-07-27 18:33:33 +03:00
2007-07-27 18:33:33 +03:00
2008-01-19 18:12:18 +02:00
2005-10-21 09:14:07 +02:00
2005-10-20 04:00:35 +02:00
2007-07-27 18:33:33 +03:00
2007-07-27 18:33:33 +03:00
2006-01-16 19:28:03 +00:00