Skip to content

Commit

Permalink
Add the batch of release v3.4.0-beta-20181212 commits
Browse files Browse the repository at this point in the history
  • Loading branch information
@developer-at-bcn
developer-at-bcn committed Dec 12, 2018
1 parent 2450fcf commit 2dc1d97
Show file tree
Hide file tree
Showing 44 changed files with 2,108 additions and 878 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ set(SOURCES
src/walletdparamsdialog.cpp
src/exportkeydialog.cpp
src/filedownloader.cpp

src/mnemonicdialog.cpp
src/version.cpp
)

include_directories(${CMAKE_BINARY_DIR} src )
Expand Down
74 changes: 50 additions & 24 deletions Windows Installer/Installer.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@
}
"Entry"
{
"MsmKey" = "8:_0394C65EF9544D1093390F27A773B039"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_11E11BEEB2774ADC8A9C2EDD8C11B0F1"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -63,6 +57,12 @@
}
"Entry"
{
"MsmKey" = "8:_22FB6F3AD790418EBE8762A9843DF579"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_2911A20E9FAB43759C37E3628DEDD0EA"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -123,13 +123,13 @@
}
"Entry"
{
"MsmKey" = "8:_787428CF3F3746B8A81F32E6C613F967"
"MsmKey" = "8:_7DD7945A6D81499A89DC5CF2E83459A0"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_7DD7945A6D81499A89DC5CF2E83459A0"
"MsmKey" = "8:_830BDEF72045486F81CE044501D656EB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
Expand Down Expand Up @@ -285,6 +285,12 @@
}
"Entry"
{
"MsmKey" = "8:_EC0AE0AD496241509B115D7ED55BED4D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_FC4D403F1CCA475AB1BDD6B8535C8452"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -528,6 +534,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_22FB6F3AD790418EBE8762A9843DF579"
{
"SourcePath" = "8:..\\bin\\bytecoind.pdb"
"TargetName" = "8:bytecoind.pdb"
"Tag" = "8:"
"Folder" = "8:_BB6FE95E6903428FBAEC9FE62CB0FE39"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2911A20E9FAB43759C37E3628DEDD0EA"
{
"SourcePath" = "8:..\\bin\\translations\\qt_uk.qm"
Expand Down Expand Up @@ -728,12 +754,12 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_787428CF3F3746B8A81F32E6C613F967"
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7DD7945A6D81499A89DC5CF2E83459A0"
{
"SourcePath" = "8:..\\bin\\bearer\\qnativewifibearer.dll"
"TargetName" = "8:qnativewifibearer.dll"
"SourcePath" = "8:..\\bin\\Qt5Svg.dll"
"TargetName" = "8:Qt5Svg.dll"
"Tag" = "8:"
"Folder" = "8:_EA323EA245EE499B85F5030B0B43A82A"
"Folder" = "8:_BB6FE95E6903428FBAEC9FE62CB0FE39"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
Expand All @@ -748,10 +774,10 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7DD7945A6D81499A89DC5CF2E83459A0"
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_830BDEF72045486F81CE044501D656EB"
{
"SourcePath" = "8:..\\bin\\Qt5Svg.dll"
"TargetName" = "8:Qt5Svg.dll"
"SourcePath" = "8:..\\bin\\walletd.pdb"
"TargetName" = "8:walletd.pdb"
"Tag" = "8:"
"Folder" = "8:_BB6FE95E6903428FBAEC9FE62CB0FE39"
"Condition" = "8:"
Expand Down Expand Up @@ -1483,23 +1509,23 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Bytecoin"
"ProductCode" = "8:{BDC4312B-0447-48BD-8D20-D5F79392639F}"
"PackageCode" = "8:{F567C990-2CB4-468A-BF20-B4B3C3672B51}"
"ProductCode" = "8:{05D20FF4-E7FF-40F8-8CA8-3ACA003F8516}"
"PackageCode" = "8:{E8EEE6EC-CD66-4B0C-ADEE-0D33B1F54345}"
"UpgradeCode" = "8:{DC5C7D60-BB08-4B97-B634-E87679CCEB3C}"
"AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:18.11.22"
"ProductVersion" = "8:18.12.12"
"Manufacturer" = "8:Bytecoin Developers"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:Bytecoin 3.3.3 Installer"
"Title" = "8:Bytecoin 3.4.0-beta-20181212 Installer"
"Subject" = "8:"
"ARPCONTACT" = "8:Bytecoin Developers"
"Keywords" = "8:"
"ARPCOMMENTS" = "8:Release version of bytecoin from 22 Nov 2018"
"ARPCOMMENTS" = "8:Release version of bytecoin from 12 Dec 2018"
"ARPURLINFOABOUT" = "8:https://bytecoin.org"
"ARPPRODUCTICON" = "8:_ABCF8F071D16461785EDF6D56ED2ABCE"
"ARPIconIndex" = "3:0"
Expand Down Expand Up @@ -1706,7 +1732,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:Release version 3.3.3 of bytecoin core and GUI wallet from 2018/11/22."
"Value" = "8:Release version 3.4.0-beta-20181212 of bytecoin core and GUI wallet from 2018/12/12."
"DefaultValue" = "8:#1202"
"UsePlugInResources" = "11:TRUE"
}
Expand Down Expand Up @@ -1945,7 +1971,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:Release version 3.3.3 of bytecoin core and GUI wallet from 2018/11/22."
"Value" = "8:Release version 3.4.0-beta-20181212 of bytecoin core and GUI wallet from 2018/12/12."
"DefaultValue" = "8:#1202"
"UsePlugInResources" = "11:TRUE"
}
Expand Down Expand Up @@ -2028,11 +2054,11 @@
}
"MergeModule"
{
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_0394C65EF9544D1093390F27A773B039"
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EC0AE0AD496241509B115D7ED55BED4D"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
"SourcePath" = "8:C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\14.12.25810\\MergeModules\\Microsoft_VC141_CRT_x64.msm"
"SourcePath" = "8:C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\14.16.27012\\MergeModules\\Microsoft_VC141_CRT_x64.msm"
"Properties"
{
}
Expand Down
96 changes: 61 additions & 35 deletions Windows Installer/Installer32.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@
}
"Entry"
{
"MsmKey" = "8:_19DF26E054FC4B00B5C0E63F9BBFFC1A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_226A23748CE84589AE1D8EDCB0BB76B3"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -111,6 +105,12 @@
}
"Entry"
{
"MsmKey" = "8:_527B50E3B4964B4F915B39B728F0D1C5"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_592E3F99FD2645909542ED15C67D22B1"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -171,7 +171,7 @@
}
"Entry"
{
"MsmKey" = "8:_7DB6004822064C4AADAC250A24321BF5"
"MsmKey" = "8:_8123DC805F1C4AB2A7D7086D1073DDE5"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
Expand Down Expand Up @@ -237,6 +237,12 @@
}
"Entry"
{
"MsmKey" = "8:_BE5E350E49E74B0189892ECDF871675C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_C56D7EA60E824DAE86A70A96133517E8"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -488,26 +494,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_19DF26E054FC4B00B5C0E63F9BBFFC1A"
{
"SourcePath" = "8:..\\bin\\bearer\\qnativewifibearer.dll"
"TargetName" = "8:qnativewifibearer.dll"
"Tag" = "8:"
"Folder" = "8:_EA323EA245EE499B85F5030B0B43A82A"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_226A23748CE84589AE1D8EDCB0BB76B3"
{
"SourcePath" = "8:..\\bin\\translations\\qt_da.qm"
Expand Down Expand Up @@ -708,6 +694,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_527B50E3B4964B4F915B39B728F0D1C5"
{
"SourcePath" = "8:..\\bin\\walletd.pdb"
"TargetName" = "8:walletd.pdb"
"Tag" = "8:"
"Folder" = "8:_BB6FE95E6903428FBAEC9FE62CB0FE39"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_592E3F99FD2645909542ED15C67D22B1"
{
"SourcePath" = "8:..\\bin\\translations\\qt_es.qm"
Expand Down Expand Up @@ -908,6 +914,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8123DC805F1C4AB2A7D7086D1073DDE5"
{
"SourcePath" = "8:..\\bin\\bytecoind.pdb"
"TargetName" = "8:bytecoind.pdb"
"Tag" = "8:"
"Folder" = "8:_BB6FE95E6903428FBAEC9FE62CB0FE39"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_819DEF9752F8409999064443BF0F48D6"
{
"SourcePath" = "8:..\\bin\\imageformats\\qico.dll"
Expand Down Expand Up @@ -1483,19 +1509,19 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Bytecoin"
"ProductCode" = "8:{A02CE31B-6721-4AF5-AD94-B1DBC3077E9C}"
"PackageCode" = "8:{7A5A1C76-9B44-4C36-9AC7-F79E2F30DBE3}"
"ProductCode" = "8:{ABB319EF-D710-495F-AE01-99CD3F1F7E0C}"
"PackageCode" = "8:{8E10D070-F583-49B2-8209-01586B3DA2F7}"
"UpgradeCode" = "8:{DC5C7D60-BB08-4B97-B634-E87679CCEB3C}"
"AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:18.11.22"
"ProductVersion" = "8:18.12.12"
"Manufacturer" = "8:Bytecoin Developers"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:32-bit Bytecoin 3.3.3 Installer"
"Title" = "8:32-bit Bytecoin 3.4.0-beta-20181212 Installer"
"Subject" = "8:"
"ARPCONTACT" = "8:Bytecoin Developers"
"Keywords" = "8:"
Expand Down Expand Up @@ -1706,7 +1732,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:32-bit release version 3.3.3 of bytecoin core and GUI wallet from 2018/11/22."
"Value" = "8:32-bit release version 3.4.0-beta-20181212 of bytecoin core and GUI wallet from 2018/12/12."
"DefaultValue" = "8:#1202"
"UsePlugInResources" = "11:TRUE"
}
Expand Down Expand Up @@ -1945,7 +1971,7 @@
"ContextData" = "8:"
"Attributes" = "3:0"
"Setting" = "3:2"
"Value" = "8:32-bit release version 3.3.3 of bytecoin core and GUI wallet from 2018/11/22."
"Value" = "8:32-bit release version 3.4.0-beta-20181212 of bytecoin core and GUI wallet from 2018/12/12."
"DefaultValue" = "8:#1202"
"UsePlugInResources" = "11:TRUE"
}
Expand Down Expand Up @@ -2028,11 +2054,11 @@
}
"MergeModule"
{
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7DB6004822064C4AADAC250A24321BF5"
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_BE5E350E49E74B0189892ECDF871675C"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
"SourcePath" = "8:C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\14.12.25810\\MergeModules\\Microsoft_VC141_CRT_x86.msm"
"SourcePath" = "8:C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\14.16.27012\\MergeModules\\Microsoft_VC141_CRT_x86.msm"
"Properties"
{
}
Expand Down
Loading

0 comments on commit 2dc1d97

Please sign in to comment.