mirror of
https://github.com/dashpay/dash.git
synced 2024-12-28 13:32:47 +01:00
dd39898a6b
Resolved conflicts: configure.ac src/clientversion.h src/qt/locale/dash_bg.ts src/qt/locale/dash_cmn.ts src/qt/locale/dash_de.ts src/qt/locale/dash_es.ts src/qt/locale/dash_fi.ts src/qt/locale/dash_pt.ts src/qt/locale/dash_ru.ts src/qt/locale/dash_sv.ts src/qt/locale/dash_vi.ts src/qt/res/icons/toolbar.png src/qt/res/icons/toolbar_testnet.png |
||
---|---|---|
.. | ||
certs | ||
pixmaps | ||
qt | ||
seeds | ||
genbuild.sh | ||
setup.nsi.in | ||
ui.rc |