Fix build error

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/Git/GitRev.cpp b/src/Git/GitRev.cpp
index 58933a0..2e48132 100644 (file)
--- a/src/Git/GitRev.cpp
+++ b/src/Git/GitRev.cpp
@@ -392,7 +392,9 @@ int GitRev::ParserFromCommit(GIT_COMMIT *commit)
        \r
        return 0;\r
 }\r
-\r
+#ifndef TRACE\r
+#define TRACE(x) 1?0:(x)\r
+#endif\r
 void GitRev::DbgPrint()\r
 {\r
        TRACE(_T("Commit %s\r\n"), this->m_CommitHash.ToString());\r

diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi
index 607d977..1686422 100644 (file)
--- a/src/TortoiseGitSetup/VersionNumberInclude.wxi
+++ b/src/TortoiseGitSetup/VersionNumberInclude.wxi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include Id="VersionNumberInclude">
        <?define MajorVersion="1" ?>
-       <?define MinorVersion="2" ?>
+       <?define MinorVersion="3" ?>
        <?define MicroVersion="1" ?>
        <?define BuildVersion="0" ?>
 </Include>