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

Merge branch 'elinks-0.12' into elinks-0.13

Browse Source 
Conflicts:
	src/config/conf.c
	src/network/ssl/ssl.c
This commit is contained in:
Kalle Olavi Niemitalo
2009-03-12 08:46:02 +02:00
committed by Kalle Olavi Niemitalo
parent 3581e2848e 5a43c55c9e
commit 1bb71f3732
26 changed files with 757 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ecmascript/ecmascript.c
View File

@@ -52,8 +52,8 @@ static struct option_info ecmascript_options[] = {
INIT_OPT_BOOL("ecmascript", N_("Ignore <noscript> content"),
"ignore_noscript", 0, 0,
N_("Whether to ignore content enclosed by the <noscript> tag\n"
"when ECMAScript is enabled.")),
N_("Whether to ignore content enclosed by the <noscript> tag "
"when ECMAScript is enabled.")),
INIT_OPT_INT("ecmascript", N_("Maximum execution time"),
"max_exec_time", 0, 1, 3600, 5,