diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-10-03 21:11:57 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-10-03 21:11:57 -0700 |
| commit | fea7236ca3411782d430139feb9e5b8ce9b82511 (patch) | |
| tree | 994279ac1d9c6fcf3bafbd912592611d136d5537 | |
| parent | 32b668655e08f6ff185a0f5ed7e94c6228956ecf (diff) | |
| parent | cbf87fc4a675529647e4185837aa03c42e93c91a (diff) | |
Merge pull request #3051 from Diapolo/bitcoind-rc
rename bitcoin-res.rc to bitcoind-res.rc
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/bitcoind-res.rc (renamed from src/bitcoin-res.rc) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2d5b46c9c8..c0687ae2e6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,7 +49,7 @@ bitcoind_SOURCES = bitcoind.cpp # if TARGET_WINDOWS -bitcoind_SOURCES += bitcoin-res.rc +bitcoind_SOURCES += bitcoind-res.rc endif AM_CPPFLAGS += $(BDB_CPPFLAGS) diff --git a/src/bitcoin-res.rc b/src/bitcoind-res.rc index 202b7ab352..202b7ab352 100644 --- a/src/bitcoin-res.rc +++ b/src/bitcoind-res.rc |