From a3b9ef4e48a195876ac84dee78e795e6cd972bc3 Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Fri, 15 Jan 2010 14:17:58 +0800
Subject: [PATCH] Fix build error

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/Git/GitRev.cpp                            | 4 +++-
 src/TortoiseGitSetup/VersionNumberInclude.wxi | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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