Skip to content

Commit

Permalink
Merge pull request #4 from ssdpool/master
Browse files Browse the repository at this point in the history
Block explorer, and Bittrex in wallet
  • Loading branch information
GlobalBoost committed Feb 16, 2015
2 parents f480201 + 7ea1525 commit 52c2b13
Show file tree
Hide file tree
Showing 129 changed files with 16,774 additions and 6,034 deletions.
4 changes: 3 additions & 1 deletion GlobalBoost-Y.pro
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ CONFIG += no_include_pwd
CONFIG += thread
CONFIG += static


greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
lessThan(QT_MAJOR_VERSION, 5): CONFIG += static
QMAKE_CXXFLAGS = -fpermissive
Expand Down Expand Up @@ -259,6 +258,7 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/servicemessagedialog.h \
src/qt/header.h \
src/qt/ActionButton.h \
src/qt/blockbrowser.h \
src/qt/QtWaitingSpinner.h \
src/qt/chatwindow.h

Expand Down Expand Up @@ -342,6 +342,7 @@ SOURCES += src/qt/bitcoin.cpp \
src/qt/header.cpp \
src/qt/QtWaitingSpinner.cpp \
src/qt/ActionButton.cpp \
src/qt/blockbrowser.cpp \
src/qt/chatwindow.cpp

RESOURCES += src/qt/bitcoin.qrc \
Expand All @@ -367,6 +368,7 @@ FORMS += src/qt/forms/sendcoinsdialog.ui \
src/qt/forms/miningpage.ui \
src/qt/plugins/mrichtexteditor/mrichtextedit.ui \
src/qt/forms/Header.ui \
src/qt/forms/blockbrowser.ui \
src/qt/forms/transactionspage.ui

contains(USE_QRCODE, 1) {
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Globalboost integration/staging tree
https://bst.globalboo.st/

Copyright (c) 2009-2013 Bitcoin Developers
Copyright (c) 2014 GlobalBoost®
Copyright (c) 2014 BSTDEV

What is Globalboost?
----------------
Expand Down
Loading

0 comments on commit 52c2b13

Please sign in to comment.