Merge branch 'master' of ssh://github.com/novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Mon, 26 Jan 2015 03:03:25 +0000 (06:03 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Mon, 26 Jan 2015 03:03:25 +0000 (06:03 +0300)
1  2 
src/qt/forms/optionsdialog.ui

Simple merge