浏览代码

Merge branch 'master' into dev

# Conflicts:

#	source/WinSCP.cbproj

Source commit: 265884be60496f9ab401f9e5bf7ad642bec773bf
Martin Prikryl 1 年之前
父节点
当前提交
716ff88932
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      source/filezilla/AsyncSslSocketLayer.h
  2. 2 2
      source/resource/TextsCore1.rc

+ 1 - 1
source/filezilla/AsyncSslSocketLayer.h

@@ -66,7 +66,7 @@ If you want to use this class in a commercial application, a short message
 to [email protected] would be appreciated but is not required.
 
 This product includes software developed by the OpenSSL Project
-for use in the OpenSSL Toolkit. (https://www.openssl.org/)
+for use in the OpenSSL Toolkit. (https://openssl-library.org/)
 */
 //---------------------------------------------------------------------------
 #ifndef AsyncSslSocketLayerH

+ 2 - 2
source/resource/TextsCore1.rc

@@ -523,9 +523,9 @@ BEGIN
   FILEZILLA_URL, "https://filezilla-project.org/"
   OPENSSL_BASED_ON, "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s."
   OPENSSL_COPYRIGHT2, "Copyright © 1998–%s The OpenSSL Project"
-  OPENSSL_URL, "https://www.openssl.org/"
+  OPENSSL_URL, "https://openssl-library.org/"
   NEON_BASED_ON2, "WebDAV/HTTP code based on neon library %s"
-  NEON_COPYRIGHT, "Copyright © 1999–2022 Joe Orton"
+  NEON_COPYRIGHT, "Copyright © 1999–2024 Joe Orton"
   NEON_URL, "https://notroj.github.io/neon/"
   EXPAT_BASED_ON, "eXpat library %s"
   EXPAT_URL, "https://libexpat.github.io/"