Skip to content

fix broken build #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2014
Merged

fix broken build #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/darkcoind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ bool AppInit(int argc, char* argv[])
//
// Parameters
//
// If Qt is used, parameters/darkcoin.conf are parsed in qt/bitcoin.cpp's main()
// If Qt is used, parameters/darkcoin.conf are parsed in qt/darkcoin.cpp's main()
ParseParameters(argc, argv);
if (!boost::filesystem::is_directory(GetDataDir(false)))
{
Expand Down
2 changes: 1 addition & 1 deletion src/qt/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ BITCOIN_MM = \
macnotificationhandler.mm

QT_MOC = \
bitcoin.moc \
darkcoin.moc \
intro.moc \
overviewpage.moc \
rpcconsole.moc
Expand Down
2 changes: 1 addition & 1 deletion src/qt/darkcoin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public slots:
void startThread();
};

#include "bitcoin.moc"
#include "darkcoin.moc"

BitcoinCore::BitcoinCore():
QObject()
Expand Down
4 changes: 2 additions & 2 deletions src/qt/locale/bitcoin_en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ Address: %4
<translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</translation>
</message>
<message>
<location filename="../bitcoin.cpp" line="+447"/>
<location filename="../darkcoin.cpp" line="+447"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</translation>
</message>
Expand Down Expand Up @@ -1706,7 +1706,7 @@ Address: %4
<context>
<name>QObject</name>
<message>
<location filename="../bitcoin.cpp" line="+71"/>
<location filename="../darkcoin.cpp" line="+71"/>
<location line="+7"/>
<location line="+13"/>
<source>Bitcoin</source>
Expand Down