diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-15 13:39:31 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-15 13:43:02 +0200 |
| commit | 6fb90d898355dc1cec7b2bfb4f38d8503886bafb (patch) | |
| tree | d9a0c463470611561ce8ad13ec5aa401bf4c2114 /src/Makefile.am | |
| parent | 63e7016566f382ff59fe724d09d556022c897222 (diff) | |
| parent | 86a5f4b54ebf5f3251f4c172cf9a5041ae43c082 (diff) | |
Merge pull request #6102
86a5f4b Relocate calls to CheckDiskSpace (Alex Morcos)
67708ac Write block index more frequently than cache flushes (Pieter Wuille)
b3ed423 Cache tweak and logging improvements (Pieter Wuille)
fc684ad Use accurate memory for flushing decisions (Pieter Wuille)
046392d Keep track of memory usage in CCoinsViewCache (Pieter Wuille)
540629c Add memusage.h (Pieter Wuille)
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 1621b2dcd0..91d530222f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,6 +100,7 @@ BITCOIN_CORE_H = \ leveldbwrapper.h \ limitedmap.h \ main.h \ + memusage.h \ merkleblock.h \ miner.h \ mruset.h \ |