1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-11-04 08:17:17 -05:00
elinks/src/viewer
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
..
dump Merge branch 'elinks-0.12' into elinks-0.13 2008-08-03 22:18:53 +03:00
text Merge branch 'elinks-0.12' into elinks-0.13 2009-01-01 19:14:01 +00:00
action.c New action: move-cursor-line-start. 2007-12-16 01:13:39 +02:00
action.h Drop unneeded include. 2008-07-26 15:57:20 +03:00
Makefile Create a module for src/viewer, which subsumes some existing modules 2006-05-20 15:01:24 +00:00
timer.c get_opt_*: Add ses parameter 2007-08-28 17:24:59 +00:00
timer.h Remove empty lines in start of header files 2005-11-15 11:33:27 +01:00
viewer.c Missing NULL 2006-05-20 17:58:13 +02:00
viewer.h Create a module for src/viewer, which subsumes some existing modules 2006-05-20 15:01:24 +00:00