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

..

document.c

Merge branch 'elinks-0.12' into elinks-0.13

2008-02-24 22:49:47 +02:00

document.h

Add a new entry Link Info under Link main menu.

2007-10-10 10:47:24 +02:00

download.c

Merge branch 'top/0.13/witekfl-scroll-dialog' (early part) into elinks-0.13

2008-10-15 23:31:17 +03:00

download.h

Remove empty lines in start of header files

2005-11-15 11:33:27 +01:00

edit.c

Cast variadic arguments of getml to void *.

2007-03-11 12:41:17 +02:00

edit.h

Remove empty lines in start of header files

2005-11-15 11:33:27 +01:00

exmode.c

config: Reduce the interface offered to exmode.

2008-02-03 14:43:26 +02:00

exmode.h

Remove empty lines in start of header files

2005-11-15 11:33:27 +01:00

info.c

Add the number of interpreters to Resources box

2008-09-06 20:18:10 +00:00

info.h

Remove empty lines in start of header files

2005-11-15 11:33:27 +01:00

Makefile

path_to_top -> top_builddir

2005-10-20 04:00:35 +02:00

menu.c

Merge branch 'elinks-0.12' into elinks-0.13

2008-08-03 22:18:53 +03:00

menu.h

Type-check button arguments of msg_box.

2007-03-10 23:50:56 +02:00

options.c

Merge branch 'elinks-0.12' into elinks-0.13

2009-01-01 19:14:01 +00:00

options.h

Remove empty lines in start of header files

2005-11-15 11:33:27 +01:00

progress.c

1008: big uploads. Added info in the status bar about uploded data.

2008-05-11 13:14:06 +02:00

progress.h

1008: big uploads. Added info in the status bar about uploded data.

2008-05-11 13:14:06 +02:00

status.c

Merge branch 'elinks-0.12' into elinks-0.13

2009-01-01 19:14:01 +00:00

status.h

Remove empty lines in start of header files

2005-11-15 11:33:27 +01:00