sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'v0.12.0.x' into v0.12.1.x

Browse Source
This commit is contained in:
Holger Schinzel 2016-01-23 11:21:35 +01:00
commit cc0fc399a4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/chainparams.cpp
View File

@ -73,6 +73,7 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
( 167996, uint256("0x000000000009486020a80f7f2cc065342b0c2fb59af5e090cd813dba68ab0fed"))
( 207992, uint256("0x00000000000d85c22be098f74576ef00b7aa00c05777e966aff68a270f1e01a5"))
( 312645, uint256("0x0000000000059dcb71ad35a9e40526c44e7aae6c99169a9e7017b7d84b1c2daf"))
( 407452, uint256("0x000000000003c6a87e73623b9d70af7cd908ae22fee466063e4ffc20be1d2dbc"))
;
static const Checkpoints::CCheckpointData data = {
&mapCheckpoints,

2
src/qt/dash_locale.qrc
View File

@ -7,7 +7,7 @@
<file alias="fi">locale/dash_fi.qm</file>
<file alias="fr">locale/dash_fr.qm</file>
<file alias="it">locale/dash_it.qm</file>
<file alias="it">locale/dash_ja.qm</file>
<file alias="ja">locale/dash_ja.qm</file>
<file alias="pl">locale/dash_pl.qm</file>
<file alias="pt">locale/dash_pt.qm</file>
<file alias="ru">locale/dash_ru.qm</file>