diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:02:38 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:02:38 +0000 |
| commit | 797d0b231bebcf2cfdb82f4d44b9a06ead2a6e3c (patch) | |
| tree | e020813e04c0d63487147f9b586b34367bed9252 /src/init.cpp | |
| parent | 5951d9fe3224b11ba9ae45df4fe44804ec0efd83 (diff) | |
| parent | 9e98fe6f584d8bdd0ffe4d5dc5c0b908beb456db (diff) | |
| download | bitcoin-797d0b231bebcf2cfdb82f4d44b9a06ead2a6e3c.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/net.cpp
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index 31e05514a2..31e2ce6bde 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -138,12 +138,12 @@ bool AppInit(int argc, char* argv[]) bool AppInit2(int argc, char* argv[]) { #ifdef _MSC_VER - // Turn off microsoft heap dump noise + // Turn off Microsoft heap dump noise _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); _CrtSetReportFile(_CRT_WARN, CreateFileA("NUL", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0)); #endif #if _MSC_VER >= 1400 - // Disable confusing "helpful" text message on abort, ctrl-c + // Disable confusing "helpful" text message on abort, Ctrl-C _set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT); #endif #ifndef WIN32 |