merge upstream v4.21-9613-beta

4 files changed, 9 insertions, 3 deletions

diff --git a/src/bin/hamcore/eula.txt b/src/bin/hamcore/eula.txt
index fa5d1717..b9d60973 100644
--- a/src/bin/hamcore/eula.txt
+++ b/src/bin/hamcore/eula.txt
@@ -1,8 +1,8 @@
 SoftEther VPN Server, Client and Bridge are free software, and released as open-source. You can redistribute them and/or modify them under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.

 

-Copyright (c) 2012-2015 Daiyuu Nobori.

-Copyright (c) 2012-2015 SoftEther Project at University of Tsukuba, Japan.

-Copyright (c) 2012-2015 SoftEther Corporation.

+Copyright (c) 2012-2016 Daiyuu Nobori.

+Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.

+Copyright (c) 2012-2016 SoftEther Corporation.

 All Rights Reserved.

 http://www.softether.org/

 

diff --git a/src/bin/hamcore/languages_wine.txt b/src/bin/hamcore/languages_wine.txt
new file mode 100644
index 00000000..b7b2a24a
--- /dev/null
+++ b/src/bin/hamcore/languages_wine.txt
@@ -0,0 +1,6 @@
+# PacketiX VPN / SoftEther VPN Language List File

+# Copyright (c) SoftEther Corporation. All Rights Reserved

+

+# 番号 識別子 英語表記 ローカル表記 Windowsロケール番号 UNIXロケール文字一覧

+1 en English English 1033 en,us,c

+

diff --git a/src/bin/vpnweb.cab b/src/bin/vpnweb.cab
index aa01c23b..37838c3d 100644
--- a/src/bin/vpnweb.cab
+++ b/src/bin/vpnweb.cab
diff --git a/src/bin/vpnweb.ocx b/src/bin/vpnweb.ocx
index f3884b1d..ce678662 100644
--- a/src/bin/vpnweb.ocx
+++ b/src/bin/vpnweb.ocx