Kalle Olavi Niemitalo 1bb71f3732 Merge branch 'elinks-0.12' into elinks-0.13 ...

Conflicts:
	src/config/conf.c
	src/network/ssl/ssl.c

2009-03-12 08:46:02 +02:00

..

dialogs.c

Revert a change that was mistakenly included in the last commit

2008-07-11 11:12:37 +00:00

dialogs.h

Remove empty lines in start of header files

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

globhist.c

Rewrap lines in option documentation.

2009-03-08 15:18:10 +02:00

globhist.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