Merge branch 'master' into 303

This commit is contained in:
tomrus88 2008-11-09 01:45:34 +03:00
commit 7a384e9374
3 changed files with 5 additions and 4 deletions

View file

@ -15,6 +15,7 @@
#include <dbghelp.h>
#include "WheatyExceptionReport.h"
#include "revision.h"
#include "revision_nr.h"
#define CrashFolder _T("Crashs")
//#pragma comment(linker, "/defaultlib:dbghelp.lib")
@ -385,7 +386,7 @@ PEXCEPTION_POINTERS pExceptionInfo )
GetLocalTime(&systime);
// Start out with a banner
_tprintf(_T("Revision: %s %s %s\r\n"), REVISION_DATE, REVISION_TIME, REVISION_ID);
_tprintf(_T("Revision: %s %s %s %s\r\n"), REVISION_DATE, REVISION_TIME, REVISION_NR, REVISION_ID);
_tprintf(_T("Date %u:%u:%u. Time %u:%u \r\n"), systime.wDay, systime.wMonth, systime.wYear, systime.wHour, systime.wMinute);
PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord;

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "6807"
#define REVISION_NR "6808"
#endif // __REVISION_NR_H__