diff options
author | Xavier Roche <roche@httrack.com> | 2015-03-14 15:03:37 +0100 |
---|---|---|
committer | Xavier Roche <roche@httrack.com> | 2015-03-14 15:03:37 +0100 |
commit | 420b0812d63aeac4458435ba14d4b2ba12241683 (patch) | |
tree | e43d3a7a6308967b0808a5dad3add70b1bfae607 | |
parent | b66479aa7e53135786df3fe64eb3d114839c302e (diff) | |
parent | e81acec4fc44f23d43e1936847a4c51cf82cc45e (diff) |
Merge branch 'master' of https://github.com/xroche/httrack
168 files changed, 96 insertions, 215 deletions
diff --git a/Makefile.am b/Makefile.am index c993d79..29c8cdc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,4 +5,4 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = INSTALL.Linux \ gpl-fr.txt license.txt greetings.txt history.txt \ - httrack-doc.html lang.def + httrack-doc.html lang.def README.md diff --git a/Makefile.in b/Makefile.in index 64b0789..8969344 100644 --- a/Makefile.in +++ b/Makefile.in @@ -268,7 +268,7 @@ SUBDIRS = src man m4 libtest templates lang html tests ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = INSTALL.Linux \ gpl-fr.txt license.txt greetings.txt history.txt \ - httrack-doc.html lang.def + httrack-doc.html lang.def README.md all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1,5 +1,5 @@ HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors Welcome to HTTrack Website Copier! @@ -1,4 +1,4 @@ -# HTTrack Website Copier - Development Repository = +# HTTrack Website Copier - Development Repository ## About _Copy websites to your computer (Offline browser)_ @@ -13,7 +13,7 @@ # # # HTTrack Website Copier, Offline Browser for Windows and Unix -# Copyright (C) 1998-2014 Xavier Roche and other contributors +# Copyright (C) 1998-2015 Xavier Roche and other contributors # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1546,7 +1546,7 @@ gives unlimited permission to copy, distribute and modify it. HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/configure.ac b/configure.ac index 0653dfd..2ecd021 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([httrack], [3.48.20], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/]) AC_COPYRIGHT([ HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/html/cache.html b/html/cache.html index 36be72f..36be72f 100755..100644 --- a/html/cache.html +++ b/html/cache.html diff --git a/html/httrack.man.html b/html/httrack.man.html index 216e1b5..54121fb 100644 --- a/html/httrack.man.html +++ b/html/httrack.man.html @@ -2286,7 +2286,7 @@ other information you deem necessary.</p> <p style="margin-left:11%; margin-top: 1em">Copyright (C) -1998-2014 Xavier Roche and other contributors</p> +1998-2015 Xavier Roche and other contributors</p> <p style="margin-left:11%; margin-top: 1em">This program is free software: you can redistribute it and/or modify it diff --git a/html/images/screenshot_01b.jpg b/html/images/screenshot_01b.jpg Binary files differindex 43392b4..43392b4 100755..100644 --- a/html/images/screenshot_01b.jpg +++ b/html/images/screenshot_01b.jpg diff --git a/html/library.html b/html/library.html index 4d555bc..4d555bc 100755..100644 --- a/html/library.html +++ b/html/library.html diff --git a/html/plug.html b/html/plug.html index 93baccd..93baccd 100755..100644 --- a/html/plug.html +++ b/html/plug.html diff --git a/html/scripting.html b/html/scripting.html index 02abb93..02abb93 100755..100644 --- a/html/scripting.html +++ b/html/scripting.html diff --git a/html/server/about.html b/html/server/about.html index 2190ad2..2190ad2 100755..100644 --- a/html/server/about.html +++ b/html/server/about.html diff --git a/html/server/addurl.html b/html/server/addurl.html index d2f8889..d2f8889 100755..100644 --- a/html/server/addurl.html +++ b/html/server/addurl.html diff --git a/html/server/div/16x16/httrack.png b/html/server/div/16x16/httrack.png Binary files differindex 3cdedaf..3cdedaf 100755..100644 --- a/html/server/div/16x16/httrack.png +++ b/html/server/div/16x16/httrack.png diff --git a/html/server/div/32x32/httrack.png b/html/server/div/32x32/httrack.png Binary files differindex f12e32b..f12e32b 100755..100644 --- a/html/server/div/32x32/httrack.png +++ b/html/server/div/32x32/httrack.png diff --git a/html/server/div/48x48/httrack.png b/html/server/div/48x48/httrack.png Binary files differindex 6e8915f..6e8915f 100755..100644 --- a/html/server/div/48x48/httrack.png +++ b/html/server/div/48x48/httrack.png diff --git a/html/server/error.html b/html/server/error.html index 0ccd756..0ccd756 100755..100644 --- a/html/server/error.html +++ b/html/server/error.html diff --git a/html/server/exit.html b/html/server/exit.html index 11c7924..11c7924 100755..100644 --- a/html/server/exit.html +++ b/html/server/exit.html diff --git a/html/server/file.html b/html/server/file.html index 5521cae..5521cae 100755..100644 --- a/html/server/file.html +++ b/html/server/file.html diff --git a/html/server/finished.html b/html/server/finished.html index 269ee73..269ee73 100755..100644 --- a/html/server/finished.html +++ b/html/server/finished.html diff --git a/html/server/help.html b/html/server/help.html index 5b55586..5b55586 100755..100644 --- a/html/server/help.html +++ b/html/server/help.html diff --git a/html/server/images/bg_rings.gif b/html/server/images/bg_rings.gif Binary files differindex 5dc34d1..5dc34d1 100755..100644 --- a/html/server/images/bg_rings.gif +++ b/html/server/images/bg_rings.gif diff --git a/html/server/images/fade.gif b/html/server/images/fade.gif Binary files differindex 0ae8336..0ae8336 100755..100644 --- a/html/server/images/fade.gif +++ b/html/server/images/fade.gif diff --git a/html/server/images/header_title_4.gif b/html/server/images/header_title_4.gif Binary files differindex d5f203a..d5f203a 100755..100644 --- a/html/server/images/header_title_4.gif +++ b/html/server/images/header_title_4.gif diff --git a/html/server/index.html b/html/server/index.html index a29c95d..a29c95d 100755..100644 --- a/html/server/index.html +++ b/html/server/index.html diff --git a/html/server/option1.html b/html/server/option1.html index 7bcbf7e..7bcbf7e 100755..100644 --- a/html/server/option1.html +++ b/html/server/option1.html diff --git a/html/server/option10.html b/html/server/option10.html index 2e72e68..2e72e68 100755..100644 --- a/html/server/option10.html +++ b/html/server/option10.html diff --git a/html/server/option11.html b/html/server/option11.html index 9571538..9571538 100755..100644 --- a/html/server/option11.html +++ b/html/server/option11.html diff --git a/html/server/option2.html b/html/server/option2.html index 3338686..3338686 100755..100644 --- a/html/server/option2.html +++ b/html/server/option2.html diff --git a/html/server/option2b.html b/html/server/option2b.html index 6afd048..6afd048 100755..100644 --- a/html/server/option2b.html +++ b/html/server/option2b.html diff --git a/html/server/option3.html b/html/server/option3.html index cef03fc..cef03fc 100755..100644 --- a/html/server/option3.html +++ b/html/server/option3.html diff --git a/html/server/option4.html b/html/server/option4.html index a95a7b0..a95a7b0 100755..100644 --- a/html/server/option4.html +++ b/html/server/option4.html diff --git a/html/server/option5.html b/html/server/option5.html index d13b438..d13b438 100755..100644 --- a/html/server/option5.html +++ b/html/server/option5.html diff --git a/html/server/option6.html b/html/server/option6.html index 926280d..926280d 100755..100644 --- a/html/server/option6.html +++ b/html/server/option6.html diff --git a/html/server/option7.html b/html/server/option7.html index 115081a..115081a 100755..100644 --- a/html/server/option7.html +++ b/html/server/option7.html diff --git a/html/server/option8.html b/html/server/option8.html index 50735ae..50735ae 100755..100644 --- a/html/server/option8.html +++ b/html/server/option8.html diff --git a/html/server/option9.html b/html/server/option9.html index 2a98334..2a98334 100755..100644 --- a/html/server/option9.html +++ b/html/server/option9.html diff --git a/html/server/refresh.html b/html/server/refresh.html index 3e59ab9..3e59ab9 100755..100644 --- a/html/server/refresh.html +++ b/html/server/refresh.html diff --git a/html/server/step2.html b/html/server/step2.html index 4f194dd..4f194dd 100755..100644 --- a/html/server/step2.html +++ b/html/server/step2.html diff --git a/html/server/step3.html b/html/server/step3.html index 40dd977..40dd977 100755..100644 --- a/html/server/step3.html +++ b/html/server/step3.html diff --git a/html/server/step4.html b/html/server/step4.html index 2620c97..2620c97 100755..100644 --- a/html/server/step4.html +++ b/html/server/step4.html diff --git a/lang/Bulgarian.txt b/lang/Bulgarian.txt index b4fecee..b4fecee 100755..100644 --- a/lang/Bulgarian.txt +++ b/lang/Bulgarian.txt diff --git a/lang/Castellano.txt b/lang/Castellano.txt index 226197d..226197d 100755..100644 --- a/lang/Castellano.txt +++ b/lang/Castellano.txt diff --git a/lang/Cesky.txt b/lang/Cesky.txt index 143a7ea..143a7ea 100755..100644 --- a/lang/Cesky.txt +++ b/lang/Cesky.txt diff --git a/lang/Chinese-BIG5.txt b/lang/Chinese-BIG5.txt index 6dae32c..6dae32c 100755..100644 --- a/lang/Chinese-BIG5.txt +++ b/lang/Chinese-BIG5.txt diff --git a/lang/Chinese-Simplified.txt b/lang/Chinese-Simplified.txt index 5e0880a..5e0880a 100755..100644 --- a/lang/Chinese-Simplified.txt +++ b/lang/Chinese-Simplified.txt diff --git a/lang/Croatian.txt b/lang/Croatian.txt index 427edaa..427edaa 100755..100644 --- a/lang/Croatian.txt +++ b/lang/Croatian.txt diff --git a/lang/Dansk.txt b/lang/Dansk.txt index 33cbdc0..33cbdc0 100755..100644 --- a/lang/Dansk.txt +++ b/lang/Dansk.txt diff --git a/lang/Deutsch.txt b/lang/Deutsch.txt index b06493f..b06493f 100755..100644 --- a/lang/Deutsch.txt +++ b/lang/Deutsch.txt diff --git a/lang/Eesti.txt b/lang/Eesti.txt index f9a6d36..f9a6d36 100755..100644 --- a/lang/Eesti.txt +++ b/lang/Eesti.txt diff --git a/lang/English.txt b/lang/English.txt index 549e300..549e300 100755..100644 --- a/lang/English.txt +++ b/lang/English.txt diff --git a/lang/Francais.txt b/lang/Francais.txt index f89f35d..f89f35d 100755..100644 --- a/lang/Francais.txt +++ b/lang/Francais.txt diff --git a/lang/Greek.txt b/lang/Greek.txt index 2d8a2d6..2d8a2d6 100755..100644 --- a/lang/Greek.txt +++ b/lang/Greek.txt diff --git a/lang/Italiano.txt b/lang/Italiano.txt index 76549b2..76549b2 100755..100644 --- a/lang/Italiano.txt +++ b/lang/Italiano.txt diff --git a/lang/Japanese.txt b/lang/Japanese.txt index 90bb569..90bb569 100755..100644 --- a/lang/Japanese.txt +++ b/lang/Japanese.txt diff --git a/lang/Macedonian.txt b/lang/Macedonian.txt index bf03882..bf03882 100755..100644 --- a/lang/Macedonian.txt +++ b/lang/Macedonian.txt diff --git a/lang/Magyar.txt b/lang/Magyar.txt index 9383c93..9383c93 100755..100644 --- a/lang/Magyar.txt +++ b/lang/Magyar.txt diff --git a/lang/Nederlands.txt b/lang/Nederlands.txt index 02a3c34..02a3c34 100755..100644 --- a/lang/Nederlands.txt +++ b/lang/Nederlands.txt diff --git a/lang/Norsk.txt b/lang/Norsk.txt index 4c8f5a2..4c8f5a2 100755..100644 --- a/lang/Norsk.txt +++ b/lang/Norsk.txt diff --git a/lang/Polski.txt b/lang/Polski.txt index 18d8686..18d8686 100755..100644 --- a/lang/Polski.txt +++ b/lang/Polski.txt diff --git a/lang/Portugues-Brasil.txt b/lang/Portugues-Brasil.txt index 6078734..6078734 100755..100644 --- a/lang/Portugues-Brasil.txt +++ b/lang/Portugues-Brasil.txt diff --git a/lang/Portugues.txt b/lang/Portugues.txt index 739d377..739d377 100755..100644 --- a/lang/Portugues.txt +++ b/lang/Portugues.txt diff --git a/lang/Romanian.txt b/lang/Romanian.txt index ff7096f..ff7096f 100755..100644 --- a/lang/Romanian.txt +++ b/lang/Romanian.txt diff --git a/lang/Russian.txt b/lang/Russian.txt index 1d9da50..1d9da50 100755..100644 --- a/lang/Russian.txt +++ b/lang/Russian.txt diff --git a/lang/Slovak.txt b/lang/Slovak.txt index 09f57e3..09f57e3 100755..100644 --- a/lang/Slovak.txt +++ b/lang/Slovak.txt diff --git a/lang/Slovenian.txt b/lang/Slovenian.txt index 1ad2300..1ad2300 100755..100644 --- a/lang/Slovenian.txt +++ b/lang/Slovenian.txt diff --git a/lang/Svenska.txt b/lang/Svenska.txt index d4b29ab..d4b29ab 100755..100644 --- a/lang/Svenska.txt +++ b/lang/Svenska.txt diff --git a/lang/Turkish.txt b/lang/Turkish.txt index 611624d..611624d 100755..100644 --- a/lang/Turkish.txt +++ b/lang/Turkish.txt diff --git a/lang/Ukrainian.txt b/lang/Ukrainian.txt index ff8a1af..ff8a1af 100755..100644 --- a/lang/Ukrainian.txt +++ b/lang/Ukrainian.txt diff --git a/libtest/Makefile.am b/libtest/Makefile.am index 8e52eaa..7c9c291 100644 --- a/libtest/Makefile.am +++ b/libtest/Makefile.am @@ -1,7 +1,7 @@ exemplesdir = $(datadir)/httrack/libtest exemples_DATA = *.c *.h *.txt -EXTRA_DIST = $(exemples_DATA) +EXTRA_DIST = $(exemples_DATA) libtest.mak libtest.vcproj AM_CPPFLAGS = \ @DEFAULT_CFLAGS@ \ diff --git a/libtest/Makefile.in b/libtest/Makefile.in index 7b4cf80..dc4ab0d 100644 --- a/libtest/Makefile.in +++ b/libtest/Makefile.in @@ -333,7 +333,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ exemplesdir = $(datadir)/httrack/libtest exemples_DATA = *.c *.h *.txt -EXTRA_DIST = $(exemples_DATA) +EXTRA_DIST = $(exemples_DATA) libtest.mak libtest.vcproj AM_CPPFLAGS = @DEFAULT_CFLAGS@ @THREADS_CFLAGS@ @V6_FLAG@ @LFS_FLAG@ \ -DPREFIX=\""$(prefix)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" -DLIBDIR=\""$(libdir)"\" -I../src diff --git a/libtest/Release/BuildLog.htm b/libtest/Release/BuildLog.htm Binary files differdeleted file mode 100644 index d137edc..0000000 --- a/libtest/Release/BuildLog.htm +++ /dev/null diff --git a/libtest/callbacks-example-baselinks.c b/libtest/callbacks-example-baselinks.c index f6705e5..f6705e5 100755..100644 --- a/libtest/callbacks-example-baselinks.c +++ b/libtest/callbacks-example-baselinks.c diff --git a/libtest/callbacks-example-changecontent.c b/libtest/callbacks-example-changecontent.c index dc6c51d..dc6c51d 100755..100644 --- a/libtest/callbacks-example-changecontent.c +++ b/libtest/callbacks-example-changecontent.c diff --git a/libtest/callbacks-example-contentfilter.c b/libtest/callbacks-example-contentfilter.c index c98120e..c98120e 100755..100644 --- a/libtest/callbacks-example-contentfilter.c +++ b/libtest/callbacks-example-contentfilter.c diff --git a/libtest/callbacks-example-displayheader.c b/libtest/callbacks-example-displayheader.c index bb71e5f..bb71e5f 100755..100644 --- a/libtest/callbacks-example-displayheader.c +++ b/libtest/callbacks-example-displayheader.c diff --git a/libtest/callbacks-example-filename.c b/libtest/callbacks-example-filename.c index 4e1fbc5..4e1fbc5 100755..100644 --- a/libtest/callbacks-example-filename.c +++ b/libtest/callbacks-example-filename.c diff --git a/libtest/callbacks-example-filename2.c b/libtest/callbacks-example-filename2.c index fe2d964..fe2d964 100755..100644 --- a/libtest/callbacks-example-filename2.c +++ b/libtest/callbacks-example-filename2.c diff --git a/libtest/callbacks-example-filenameiisbug.c b/libtest/callbacks-example-filenameiisbug.c index b615abc..b615abc 100755..100644 --- a/libtest/callbacks-example-filenameiisbug.c +++ b/libtest/callbacks-example-filenameiisbug.c diff --git a/libtest/callbacks-example-listlinks.c b/libtest/callbacks-example-listlinks.c index 598f8d4..598f8d4 100755..100644 --- a/libtest/callbacks-example-listlinks.c +++ b/libtest/callbacks-example-listlinks.c diff --git a/libtest/callbacks-example-log.c b/libtest/callbacks-example-log.c index 94f0332..94f0332 100755..100644 --- a/libtest/callbacks-example-log.c +++ b/libtest/callbacks-example-log.c diff --git a/libtest/callbacks-example-simple.c b/libtest/callbacks-example-simple.c index 975f695..975f695 100755..100644 --- a/libtest/callbacks-example-simple.c +++ b/libtest/callbacks-example-simple.c diff --git a/libtest/libtest.vcproj.ROCHEPC.Xavier Roche.user b/libtest/libtest.vcproj.ROCHEPC.Xavier Roche.user deleted file mode 100644 index 1d1cc28..0000000 --- a/libtest/libtest.vcproj.ROCHEPC.Xavier Roche.user +++ /dev/null @@ -1,121 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioUserFile - ProjectType="Visual C++" - Version="9,00" - ShowAllFiles="false" - > - <Configurations> - <Configuration - Name="Debug|Win32" - > - <DebugSettings - Command="$(TargetPath)" - WorkingDirectory="" - CommandArguments="" - Attach="false" - DebuggerType="3" - Remote="1" - RemoteMachine="ROCHEPC" - RemoteCommand="" - HttpUrl="" - PDBPath="" - SQLDebugging="" - Environment="" - EnvironmentMerge="true" - DebuggerFlavor="" - MPIRunCommand="" - MPIRunArguments="" - MPIRunWorkingDirectory="" - ApplicationCommand="" - ApplicationArguments="" - ShimCommand="" - MPIAcceptMode="" - MPIAcceptFilter="" - /> - </Configuration> - <Configuration - Name="Debug|x64" - > - <DebugSettings - Command="$(TargetPath)" - WorkingDirectory="" - CommandArguments="" - Attach="false" - DebuggerType="3" - Remote="1" - RemoteMachine="ROCHEPC" - RemoteCommand="" - HttpUrl="" - PDBPath="" - SQLDebugging="" - Environment="" - EnvironmentMerge="true" - DebuggerFlavor="" - MPIRunCommand="" - MPIRunArguments="" - MPIRunWorkingDirectory="" - ApplicationCommand="" - ApplicationArguments="" - ShimCommand="" - MPIAcceptMode="" - MPIAcceptFilter="" - /> - </Configuration> - <Configuration - Name="Release|Win32" - > - <DebugSettings - Command="$(TargetPath)" - WorkingDirectory="" - CommandArguments="" - Attach="false" - DebuggerType="3" - Remote="1" - RemoteMachine="ROCHEPC" - RemoteCommand="" - HttpUrl="" - PDBPath="" - SQLDebugging="" - Environment="" - EnvironmentMerge="true" - DebuggerFlavor="" - MPIRunCommand="" - MPIRunArguments="" - MPIRunWorkingDirectory="" - ApplicationCommand="" - ApplicationArguments="" - ShimCommand="" - MPIAcceptMode="" - MPIAcceptFilter="" - /> - </Configuration> - <Configuration - Name="Release|x64" - > - <DebugSettings - Command="$(TargetPath)" - WorkingDirectory="" - CommandArguments="" - Attach="false" - DebuggerType="3" - Remote="1" - RemoteMachine="ROCHEPC" - RemoteCommand="" - HttpUrl="" - PDBPath="" - SQLDebugging="" - Environment="" - EnvironmentMerge="true" - DebuggerFlavor="" - MPIRunCommand="" - MPIRunArguments="" - MPIRunWorkingDirectory="" - ApplicationCommand="" - ApplicationArguments="" - ShimCommand="" - MPIAcceptMode="" - MPIAcceptFilter="" - /> - </Configuration> - </Configurations> -</VisualStudioUserFile> diff --git a/license.txt b/license.txt index 5527138..65e717c 100644 --- a/license.txt +++ b/license.txt @@ -1,7 +1,7 @@ HTTrack Website Copier License Agreement: HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/man/httrack.1 b/man/httrack.1 index 1289cd3..b0d4cf9 100644 --- a/man/httrack.1 +++ b/man/httrack.1 @@ -1,7 +1,7 @@ .\" Process this file with .\" groff -man -Tascii httrack.1 .\" -.TH httrack 1 "15 October 2014" "httrack website copier" +.TH httrack 1 "14 March 2015" "httrack website copier" .SH NAME httrack \- offline browser : copy websites to a local directory .SH SYNOPSIS @@ -610,7 +610,7 @@ Please reports bugs to .B <bugs@httrack.com>. Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary. .SH COPYRIGHT -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/Makefile.am b/src/Makefile.am index 8fbe044..56788fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -97,4 +97,5 @@ EXTRA_DIST = httrack.h webhttrack \ proxy/proxystrings.h \ proxy/proxytrack.h \ proxy/store.h \ + proxy/proxytrack.vcproj \ *.dsw *.dsp *.vcproj diff --git a/src/Makefile.in b/src/Makefile.in index 4cf5802..fcdc0a0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -410,6 +410,7 @@ EXTRA_DIST = httrack.h webhttrack \ proxy/proxystrings.h \ proxy/proxytrack.h \ proxy/store.h \ + proxy/proxytrack.vcproj \ *.dsw *.dsp *.vcproj all: all-am diff --git a/src/hts-indextmpl.h b/src/hts-indextmpl.h index d35d1a3..1494c4f 100644 --- a/src/hts-indextmpl.h +++ b/src/hts-indextmpl.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsalias.c b/src/htsalias.c index df608fc..26e3174 100644 --- a/src/htsalias.c +++ b/src/htsalias.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsalias.h b/src/htsalias.h index b09d18f..03ae5d9 100644 --- a/src/htsalias.h +++ b/src/htsalias.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsarrays.h b/src/htsarrays.h index c89222e..1f231af 100644 --- a/src/htsarrays.h +++ b/src/htsarrays.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsback.c b/src/htsback.c index 8933524..3704fd7 100644 --- a/src/htsback.c +++ b/src/htsback.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsback.h b/src/htsback.h index 5c1aac8..bc7a0f6 100644 --- a/src/htsback.h +++ b/src/htsback.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsbase.h b/src/htsbase.h index a3d7743..c520e5c 100644 --- a/src/htsbase.h +++ b/src/htsbase.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsbasenet.h b/src/htsbasenet.h index 23901d0..00677ff 100644 --- a/src/htsbasenet.h +++ b/src/htsbasenet.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsbauth.c b/src/htsbauth.c index f0d6240..23059c0 100644 --- a/src/htsbauth.c +++ b/src/htsbauth.c @@ -1,6 +1,6 @@ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsbauth.h b/src/htsbauth.h index dd57070..f5a26bf 100644 --- a/src/htsbauth.h +++ b/src/htsbauth.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htscache.c b/src/htscache.c index 46d2bb4..ecdeff5 100644 --- a/src/htscache.c +++ b/src/htscache.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htscache.h b/src/htscache.h index 16172ce..1c25159 100644 --- a/src/htscache.h +++ b/src/htscache.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htscatchurl.c b/src/htscatchurl.c index e14eee6..9678d60 100644 --- a/src/htscatchurl.c +++ b/src/htscatchurl.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htscatchurl.h b/src/htscatchurl.h index 02259dd..2b79c28 100644 --- a/src/htscatchurl.h +++ b/src/htscatchurl.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htscharset.c b/src/htscharset.c index ad994a5..a93598e 100644 --- a/src/htscharset.c +++ b/src/htscharset.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htscharset.h b/src/htscharset.h index 9cb9edb..06f1145 100644 --- a/src/htscharset.h +++ b/src/htscharset.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsconfig.h b/src/htsconfig.h index 7d2adf0..a8112f4 100644 --- a/src/htsconfig.h +++ b/src/htsconfig.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htscore.c b/src/htscore.c index fbcc972..46c0927 100644 --- a/src/htscore.c +++ b/src/htscore.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3993,5 +3993,5 @@ void voidf(void) { (void) a; } -// HTTrack Website Copier Copyright (C) 1998-2014 Xavier Roche and other contributors +// HTTrack Website Copier Copyright (C) 1998-2015 Xavier Roche and other contributors // diff --git a/src/htscore.h b/src/htscore.h index 1c35c8a..50df9f2 100644 --- a/src/htscore.h +++ b/src/htscore.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htscoremain.c b/src/htscoremain.c index c7c991b..215e595 100644 --- a/src/htscoremain.c +++ b/src/htscoremain.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htscoremain.h b/src/htscoremain.h index 05baeaf..85d4ddc 100644 --- a/src/htscoremain.h +++ b/src/htscoremain.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsdefines.h b/src/htsdefines.h index fe5105f..0df28cf 100644 --- a/src/htsdefines.h +++ b/src/htsdefines.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsencoding.c b/src/htsencoding.c index e6e0ff6..a15d83d 100644 --- a/src/htsencoding.c +++ b/src/htsencoding.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsencoding.h b/src/htsencoding.h index ad5fee3..f1f1b39 100644 --- a/src/htsencoding.h +++ b/src/htsencoding.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsfilters.c b/src/htsfilters.c index ad879f4..55e19b3 100644 --- a/src/htsfilters.c +++ b/src/htsfilters.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsfilters.h b/src/htsfilters.h index c08bd06..ec081d9 100644 --- a/src/htsfilters.h +++ b/src/htsfilters.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsftp.c b/src/htsftp.c index ccba1bd..5c0613e 100644 --- a/src/htsftp.c +++ b/src/htsftp.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsftp.h b/src/htsftp.h index ef6fca7..a91e17c 100644 --- a/src/htsftp.h +++ b/src/htsftp.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsglobal.h b/src/htsglobal.h index 78a99d3..bf504f4 100644 --- a/src/htsglobal.h +++ b/src/htsglobal.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -206,7 +206,7 @@ Please visit our Website: http://www.httrack.com /* Taille max ligne de commande (>=HTS_URLMAXSIZE*2) */ #define HTS_CDLMAXSIZE 1024 -/* Copyright (C) 1998-2014 Xavier Roche and other contributors */ +/* Copyright (C) 1998-2015 Xavier Roche and other contributors */ #define HTTRACK_AFF_AUTHORS "[XR&CO'2014]" #define HTS_DEFAULT_FOOTER "<!-- Mirrored from %s%s by HTTrack Website Copier/"HTTRACK_AFF_VERSION" "HTTRACK_AFF_AUTHORS", %s -->" #define HTTRACK_WEB "http://www.httrack.com" diff --git a/src/htshash.c b/src/htshash.c index 405fa4a..8545fc4 100644 --- a/src/htshash.c +++ b/src/htshash.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htshash.h b/src/htshash.h index 484eb76..021bc4f 100644 --- a/src/htshash.h +++ b/src/htshash.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htshelp.c b/src/htshelp.c index acd0e3c..b75b80a 100644 --- a/src/htshelp.c +++ b/src/htshelp.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -182,7 +182,7 @@ void help_wizard(httrackp * opt) { printf("\n"); printf("Welcome to HTTrack Website Copier (Offline Browser) " HTTRACK_VERSION "%s\n", hts_get_version_info(opt)); - printf("Copyright (C) 1998-2014 Xavier Roche and other contributors\n"); + printf("Copyright (C) 1998-2015 Xavier Roche and other contributors\n"); #ifdef _WIN32 printf("Note: You are running the commandline version,\n"); printf("run 'WinHTTrack.exe' to get the GUI version.\n"); @@ -795,7 +795,7 @@ void help(const char *app, int more) { sprintf(info, "HTTrack version " HTTRACK_VERSION "%s", hts_is_available()); infomsg(info); - infomsg("Copyright (C) 1998-2014 Xavier Roche and other contributors"); + infomsg("Copyright (C) 1998-2015 Xavier Roche and other contributors"); #ifdef HTS_PLATFORM_NAME infomsg("[compiled: " HTS_PLATFORM_NAME "]"); #endif diff --git a/src/htshelp.h b/src/htshelp.h index 7add77e..ee2958d 100644 --- a/src/htshelp.h +++ b/src/htshelp.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsindex.c b/src/htsindex.c index 2f633fd..6e9d135 100644 --- a/src/htsindex.c +++ b/src/htsindex.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsindex.h b/src/htsindex.h index ca9c472..8bbc1b5 100644 --- a/src/htsindex.h +++ b/src/htsindex.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsjava.c b/src/htsjava.c index 44ecbc4..872b484 100644 --- a/src/htsjava.c +++ b/src/htsjava.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsjava.h b/src/htsjava.h index 3e8a5d6..d465325 100644 --- a/src/htsjava.h +++ b/src/htsjava.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htslib.c b/src/htslib.c index 4aa63f0..1a4a4f2 100644 --- a/src/htslib.c +++ b/src/htslib.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htslib.h b/src/htslib.h index fcfce4b..cfcd589 100644 --- a/src/htslib.h +++ b/src/htslib.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsmd5.c b/src/htsmd5.c index 21d9d37..0586ff2 100644 --- a/src/htsmd5.c +++ b/src/htsmd5.c @@ -1,7 +1,7 @@ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsmd5.h b/src/htsmd5.h index 091a454..e3f7639 100644 --- a/src/htsmd5.h +++ b/src/htsmd5.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsmodules.c b/src/htsmodules.c index e49bd7c..3cb942c 100644 --- a/src/htsmodules.c +++ b/src/htsmodules.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsmodules.h b/src/htsmodules.h index 18eef8e..b78ae92 100644 --- a/src/htsmodules.h +++ b/src/htsmodules.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsname.c b/src/htsname.c index 6b29256..6fd28b8 100644 --- a/src/htsname.c +++ b/src/htsname.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsname.h b/src/htsname.h index 675b0cb..1b6da09 100644 --- a/src/htsname.h +++ b/src/htsname.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsnet.h b/src/htsnet.h index a393129..13a40d0 100644 --- a/src/htsnet.h +++ b/src/htsnet.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsopt.h b/src/htsopt.h index 6581045..f50a812 100644 --- a/src/htsopt.h +++ b/src/htsopt.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsparse.c b/src/htsparse.c index 19c7577..cf90bcc 100644 --- a/src/htsparse.c +++ b/src/htsparse.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsparse.h b/src/htsparse.h index 01eb953..087043d 100644 --- a/src/htsparse.h +++ b/src/htsparse.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsrobots.c b/src/htsrobots.c index dac9400..b400dcd 100644 --- a/src/htsrobots.c +++ b/src/htsrobots.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsrobots.h b/src/htsrobots.h index 9160372..357cf70 100644 --- a/src/htsrobots.h +++ b/src/htsrobots.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htssafe.h b/src/htssafe.h index 18ede0e..4ca16c6 100644 --- a/src/htssafe.h +++ b/src/htssafe.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsserver.c b/src/htsserver.c index e358d1e..2f3d75c 100644 --- a/src/htsserver.c +++ b/src/htsserver.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsserver.h b/src/htsserver.h index b5decfd..5d44e64 100644 --- a/src/htsserver.h +++ b/src/htsserver.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsstrings.h b/src/htsstrings.h index 62c4877..0181824 100755..100644 --- a/src/htsstrings.h +++ b/src/htsstrings.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsthread.c b/src/htsthread.c index cfb9160..f79e4ff 100644 --- a/src/htsthread.c +++ b/src/htsthread.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsthread.h b/src/htsthread.h index 3376d99..9084188 100644 --- a/src/htsthread.h +++ b/src/htsthread.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htstools.c b/src/htstools.c index adf79ac..0b44c0a 100644 --- a/src/htstools.c +++ b/src/htstools.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htstools.h b/src/htstools.h index 1289849..37d3370 100644 --- a/src/htstools.h +++ b/src/htstools.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsweb.c b/src/htsweb.c index 915cf97..d639ed7 100644 --- a/src/htsweb.c +++ b/src/htsweb.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htsweb.h b/src/htsweb.h index 8bea6e7..734aa25 100644 --- a/src/htsweb.h +++ b/src/htsweb.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htswizard.c b/src/htswizard.c index fba50ad..3a4dfe6 100644 --- a/src/htswizard.c +++ b/src/htswizard.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htswizard.h b/src/htswizard.h index 42a3e43..0a98f6d 100644 --- a/src/htswizard.h +++ b/src/htswizard.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htswrap.c b/src/htswrap.c index 7683034..21355d1 100644 --- a/src/htswrap.c +++ b/src/htswrap.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htswrap.h b/src/htswrap.h index 443abda..c5f67be 100644 --- a/src/htswrap.h +++ b/src/htswrap.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htszlib.c b/src/htszlib.c index 05cc457..0775d7f 100644 --- a/src/htszlib.c +++ b/src/htszlib.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/htszlib.h b/src/htszlib.h index b2df46e..a536a80 100644 --- a/src/htszlib.h +++ b/src/htszlib.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/httrack-library.h b/src/httrack-library.h index 248c370..b112c2a 100644 --- a/src/httrack-library.h +++ b/src/httrack-library.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/httrack.c b/src/httrack.c index 69fc5db..f764466 100644 --- a/src/httrack.c +++ b/src/httrack.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/httrack.h b/src/httrack.h index 36787ba..950924a 100644 --- a/src/httrack.h +++ b/src/httrack.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/httrack.vcproj b/src/httrack.vcproj index f6697f0..f6697f0 100755..100644 --- a/src/httrack.vcproj +++ b/src/httrack.vcproj diff --git a/src/proxy/main.c b/src/proxy/main.c index 181994b..a9b2243 100644 --- a/src/proxy/main.c +++ b/src/proxy/main.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -91,7 +91,7 @@ int main(int argc, char *argv[]) { /* Args */ printf("ProxyTrack %s, build proxies upon HTTrack Website Copier Archives\n", PROXYTRACK_VERSION); - printf("Copyright (C) 1998-2014 Xavier Roche and other contributors\n"); + printf("Copyright (C) 1998-2015 Xavier Roche and other contributors\n"); printf("\n"); printf("This program is free software: you can redistribute it and/or modify\n"); printf("it under the terms of the GNU General Public License as published by\n"); diff --git a/src/proxy/proxystrings.h b/src/proxy/proxystrings.h index dc70286..f0de175 100755..100644 --- a/src/proxy/proxystrings.h +++ b/src/proxy/proxystrings.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/proxy/proxytrack.c b/src/proxy/proxytrack.c index ccb93c9..11dee02 100644 --- a/src/proxy/proxytrack.c +++ b/src/proxy/proxytrack.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/proxy/proxytrack.h b/src/proxy/proxytrack.h index b42f134..feb8196 100644 --- a/src/proxy/proxytrack.h +++ b/src/proxy/proxytrack.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/proxy/store.c b/src/proxy/store.c index e8e98e5..d1f3103 100644 --- a/src/proxy/store.c +++ b/src/proxy/store.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/proxy/store.h b/src/proxy/store.h index e89bd91..3eee0b1 100644 --- a/src/proxy/store.h +++ b/src/proxy/store.h @@ -1,7 +1,7 @@ /* ------------------------------------------------------------ */ /* HTTrack Website Copier, Offline Browser for Windows and Unix -Copyright (C) 1998-2014 Xavier Roche and other contributors +Copyright (C) 1998-2015 Xavier Roche and other contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/webhttrack.dsp b/src/webhttrack.dsp index 60e8ff9..60e8ff9 100755..100644 --- a/src/webhttrack.dsp +++ b/src/webhttrack.dsp diff --git a/src/webhttrack.dsw b/src/webhttrack.dsw index ea9ea0b..ea9ea0b 100755..100644 --- a/src/webhttrack.dsw +++ b/src/webhttrack.dsw diff --git a/templates/topindex-bodycat.html b/templates/topindex-bodycat.html index d7fda04..d7fda04 100755..100644 --- a/templates/topindex-bodycat.html +++ b/templates/topindex-bodycat.html |