Success build TortoiseMerge.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseMerge / AboutDlg.cpp

diff --git a/src/TortoiseMerge/AboutDlg.cpp b/src/TortoiseMerge/AboutDlg.cpp
index 258b4a7..617f251 100644 (file)
--- a/src/TortoiseMerge/AboutDlg.cpp
+++ b/src/TortoiseMerge/AboutDlg.cpp
@@ -19,10 +19,10 @@
 #include "stdafx.h"\r
 #include "TortoiseMerge.h"\r
 #include "AboutDlg.h"\r
-//#include "svn_version.h"\r
-//#include "svn_diff.h"\r
-//#include "..\..\\apr\include\apr_version.h"\r
-//#include "..\..\apr-util\include\apu_version.h"\r
+#include "svn_version.h"\r
+#include "svn_diff.h"\r
+#include "..\..\\apr\include\apr_version.h"\r
+#include "..\..\apr-util\include\apu_version.h"\r
 #include "..\version.h"\r
 \r
 // CAboutDlg dialog\r
@@ -93,7 +93,7 @@ BOOL CAboutDlg::OnInitDialog()
        //  when the application's main window is not a dialog\r
        SetIcon(m_hIcon, TRUE);                 // Set big icon\r
        SetIcon(m_hIcon, FALSE);                // Set small icon\r
-#if 0\r
+\r
        //set the version string\r
        CString temp, boxtitle;\r
        boxtitle.Format(IDS_ABOUTVERSIONBOX, TSVN_VERMAJOR, TSVN_VERMINOR, TSVN_VERMICRO, TSVN_VERBUILD, _T(TSVN_PLATFORM), _T(TSVN_VERDATE));\r
@@ -117,7 +117,7 @@ BOOL CAboutDlg::OnInitDialog()
 \r
        m_cWebLink.SetURL(_T("http://tortoisesvn.net"));\r
        m_cSupportLink.SetURL(_T("http://tortoisesvn.tigris.org/contributors.html"));\r
-#endif\r
+\r
        return TRUE;  // return TRUE unless you set the focus to a control\r
        // EXCEPTION: OCX Property Pages should return FALSE\r
 }\r