diff --git a/cellframe-node b/cellframe-node index 05390ed0cfd4039a31acb6ae1b618e4715e37ebd..7e9bd4e84e151c4adf8c2f5c204d56a79491505d 160000 --- a/cellframe-node +++ b/cellframe-node @@ -1 +1 @@ -Subproject commit 05390ed0cfd4039a31acb6ae1b618e4715e37ebd +Subproject commit 7e9bd4e84e151c4adf8c2f5c204d56a79491505d diff --git a/os/windows/build.nsi b/os/windows/build.nsi index 5dd697e68f821eac7aa9471e7509861d1afff3b2..ce59afe11b487a107f730ccfaff33ca3fecba043 100644 --- a/os/windows/build.nsi +++ b/os/windows/build.nsi @@ -174,12 +174,13 @@ Section "${APP_NAME}" CORE StrCpy $net1 "Backbone" StrCpy $net2 "raiden" StrCpy $net3 "riemann" -; StrCpy $net4 "kelvpn-minkowski" + StrCpy $net4 "KelVPN" CopyFiles "$ConfigPath\share\configs\network\$net1.cfg.tpl" "$ConfigPath\etc\network\$net1.cfg" CopyFiles "$ConfigPath\share\configs\network\$net2.cfg.tpl" "$ConfigPath\etc\network\$net2.cfg" CopyFiles "$ConfigPath\share\configs\network\$net3.cfg.tpl" "$ConfigPath\etc\network\$net3.cfg" -; CopyFiles "$ConfigPath\share\configs\network\$net4.cfg.tpl" "$ConfigPath\etc\network\$net4.cfg" + CopyFiles "$ConfigPath\share\configs\network\$net4.cfg.tpl" "$ConfigPath\etc\network\$net4.cfg" + !insertmacro modifyConfigFiles WriteRegStr HKLM "${UNINSTALL_PATH}" "DisplayName" "${APP_NAME} ${APP_VER}" WriteRegStr HKLM "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\Uninstall.exe" diff --git a/version.mk b/version.mk index 5c742e875abbebcff188450457f3b36e5889e0d4..dbcd8430e1215535cb9ea51d3619e120ce512d05 100644 --- a/version.mk +++ b/version.mk @@ -1,4 +1,4 @@ VERSION_MAJOR=2 VERSION_MINOR=12 -VERSION_PATCH=39 +VERSION_PATCH=40