diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
| commit | e0eb815b67734abd09ff41e2271630d4b2a6d760 (patch) | |
| tree | 0df971c34f98d2a1dfd0921524a17d561a4a6536 /lib/common/Utils.h | |
| parent | 676c9e1c9d4ac8eb8a440d7f11c4ac44f98f4a6a (diff) | |
| parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) | |
merge upstream version 0.12
Diffstat (limited to 'lib/common/Utils.h')
| -rw-r--r-- | lib/common/Utils.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/common/Utils.h b/lib/common/Utils.h index 8d98a520..8a938981 100644 --- a/lib/common/Utils.h +++ b/lib/common/Utils.h @@ -39,6 +39,11 @@ std::string FormatUsageBar(int64_t Blocks, int64_t Bytes, int64_t Max, std::string FormatUsageLineStart(const std::string& rName, bool MachineReadable); +<<<<<<< HEAD +======= +std::string BoxGetTemporaryDirectoryName(); + +>>>>>>> 0.12 #include "MemLeakFindOff.h" #endif // UTILS__H |