0
0
mirror of https://github.com/rkd77/elinks.git synced 2025-09-21 19:46:23 -04:00

Merge branch 'elinks-0.12' into elinks-0.13

Conflicts:

	src/document/document.h
	src/encoding/encoding.c
	src/network/connection.c
	src/protocol/bittorrent/bittorrent.c
	src/protocol/bittorrent/bittorrent.h
	src/protocol/bittorrent/common.h
	src/protocol/bittorrent/connection.c
	src/protocol/bittorrent/dialogs.c
	src/protocol/bittorrent/tracker.c
	src/protocol/file/cgi.c
	src/protocol/http/http.c
This commit is contained in:
Kalle Olavi Niemitalo
2008-08-03 21:33:48 +03:00
committed by Kalle Olavi Niemitalo
72 changed files with 2488 additions and 637 deletions

View File

@@ -52,7 +52,7 @@ struct ecmascript_interpreter {
* ecmascript_fragile, but it can happen i.e. when the urrent document
* is reloaded in another tab and then you just cause the current tab
* to redraw. */
unsigned int onload_snippets_document_id;
unsigned int onload_snippets_cache_id;
};
/* Why is the interpreter bound to {struct view_state} instead of {struct