Merge pull request #279 from qtumproject/master

Sync testnet-2 to master

Makefile.am

@@ -39,9 +39,9 @@ OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
 OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
 
 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
-DIST_CONTRIB = $(top_srcdir)/contrib/bitcoin-cli.bash-completion \
-	       $(top_srcdir)/contrib/bitcoin-tx.bash-completion \
-	       $(top_srcdir)/contrib/bitcoind.bash-completion \
+DIST_CONTRIB = $(top_srcdir)/contrib/qtum-cli.bash-completion \
+	       $(top_srcdir)/contrib/qtum-tx.bash-completion \
+	       $(top_srcdir)/contrib/qtumd.bash-completion \
 	       $(top_srcdir)/contrib/init \
 	       $(top_srcdir)/contrib/rpm
 

contrib/debian/README.md

@@ -1,21 +1,21 @@
 
 Debian
 ====================
-This directory contains files used to package bitcoind/bitcoin-qt
-for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here.
+This directory contains files used to package qtumd/qtum-qt
+for Debian-based Linux systems. If you compile qtumd/qtum-qt yourself, there are some useful files here.
 
-## bitcoin: URI support ##
+## qtum: URI support ##
 
 
-bitcoin-qt.desktop  (Gnome / Open Desktop)
+qtum-qt.desktop  (Gnome / Open Desktop)
 To install:
 
-	sudo desktop-file-install bitcoin-qt.desktop
+	sudo desktop-file-install qtum-qt.desktop
 	sudo update-desktop-database
 
 If you build yourself, you will either need to modify the paths in
-the .desktop file or copy or symlink your bitcoin-qt binary to `/usr/bin`
+the .desktop file or copy or symlink your qtum-qt binary to `/usr/bin`
 and the `../../share/pixmaps/bitcoin128.png` to `/usr/share/pixmaps`
 
-bitcoin-qt.protocol (KDE)
+qtum-qt.protocol (KDE)