Build TortoiseProc Success

diff --git a/Git/Git.vcproj b/Git/Git.vcproj
index bf46a55..bcc0170 100644 (file)
--- a/Git/Git.vcproj
+++ b/Git/Git.vcproj
@@ -195,6 +195,22 @@
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r

+                               RelativePath=".\CrashReport.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\GitAdminDir.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\GitRev.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\GitStatus.h"\r
+                               >\r
+                       </File>\r
+                       <File\r

                                RelativePath=".\stdafx.h"\r
                                >\r
                        </File>\r
                                RelativePath=".\stdafx.h"\r
                                >\r
                        </File>\r


@@ -202,6 +218,10 @@
                                RelativePath=".\targetver.h"\r
                                >\r
                        </File>\r
                                RelativePath=".\targetver.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\TGitPath.h"\r
+                               >\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r

diff --git a/Resources/TortoiseProcENG.rc b/Resources/TortoiseProcENG.rc
index 108626f..c56720b 100644 (file)
Binary files a/Resources/TortoiseProcENG.rc and b/Resources/TortoiseProcENG.rc differ

diff --git a/TortoiseProc/AboutDlg.cpp b/TortoiseProc/AboutDlg.cpp
index c098beb..95aed51 100644 (file)
--- a/TortoiseProc/AboutDlg.cpp
+++ b/TortoiseProc/AboutDlg.cpp
@@ -20,9 +20,9 @@
 #include "stdafx.h"\r
 #include "TortoiseProc.h"\r
 #include "AboutDlg.h"\r
 #include "stdafx.h"\r
 #include "TortoiseProc.h"\r
 #include "AboutDlg.h"\r

-#include "svn_version.h"\r
+//#include "svn_version.h"\r

 #include "..\version.h"\r
 #include "..\version.h"\r

-#include "AppUtils.h"\r
+//#include "AppUtils.h"\r

 \r
 IMPLEMENT_DYNAMIC(CAboutDlg, CStandAloneDialog)\r
 CAboutDlg::CAboutDlg(CWnd* pParent /*=NULL*/)\r
 \r
 IMPLEMENT_DYNAMIC(CAboutDlg, CStandAloneDialog)\r
 CAboutDlg::CAboutDlg(CWnd* pParent /*=NULL*/)\r


@@ -53,6 +53,8 @@ BOOL CAboutDlg::OnInitDialog()
 \r
        // set the version string\r
        CString temp;\r
 \r
        // set the version string\r
        CString temp;\r

+\r
+#if 0\r

        const svn_version_t * svnver = svn_client_version();\r
 \r
        temp.Format(IDS_ABOUTVERSION, TSVN_VERMAJOR, TSVN_VERMINOR, TSVN_VERMICRO, TSVN_VERBUILD, _T(TSVN_PLATFORM), _T(TSVN_VERDATE), \r
        const svn_version_t * svnver = svn_client_version();\r
 \r
        temp.Format(IDS_ABOUTVERSION, TSVN_VERMAJOR, TSVN_VERMINOR, TSVN_VERMICRO, TSVN_VERBUILD, _T(TSVN_PLATFORM), _T(TSVN_VERDATE), \r


@@ -63,6 +65,7 @@ BOOL CAboutDlg::OnInitDialog()
                _T(OPENSSL_VERSION_TEXT),\r
                _T(ZLIB_VERSION));\r
        SetDlgItemText(IDC_VERSIONABOUT, temp);\r
                _T(OPENSSL_VERSION_TEXT),\r
                _T(ZLIB_VERSION));\r
        SetDlgItemText(IDC_VERSIONABOUT, temp);\r

+#endif\r

        this->SetWindowText(_T("TortoiseSVN"));\r
 \r
        CPictureHolder tmpPic;\r
        this->SetWindowText(_T("TortoiseSVN"));\r
 \r
        CPictureHolder tmpPic;\r


@@ -134,5 +137,5 @@ void CAboutDlg::OnBnClickedUpdate()
        GetModuleFileName(NULL, com, MAX_PATH);\r
        _tcscat_s(com, MAX_PATH+100, _T(" /command:updatecheck /visible"));\r
 \r
        GetModuleFileName(NULL, com, MAX_PATH);\r
        _tcscat_s(com, MAX_PATH+100, _T(" /command:updatecheck /visible"));\r
 \r

-       CAppUtils::LaunchApplication(com, 0, false);\r
+//     CAppUtils::LaunchApplication(com, 0, false);\r

 }\r
 }\r

diff --git a/TortoiseProc/AppUtils.h b/TortoiseProc/AppUtils.h
index b55a80c..62ab4b6 100644 (file)
--- a/TortoiseProc/AppUtils.h
+++ b/TortoiseProc/AppUtils.h
@@ -18,9 +18,9 @@
 //\r
 #pragma once\r
 #include "HistoryCombo.h"\r
 //\r
 #pragma once\r
 #include "HistoryCombo.h"\r

-#include "SVNRev.h"\r
+//#include "SVNRev.h"\r

 \r
 \r

-class CTSVNPath;\r
+class CTGitPath;\r

 \r
 /**\r
  * \ingroup TortoiseProc\r
 \r
 /**\r
  * \ingroup TortoiseProc\r


@@ -129,7 +129,7 @@ public:
        static bool FormatTextInRichEditControl(CWnd * pWnd);\r
        static bool FindStyleChars(const CString& sText, TCHAR stylechar, int& start, int& end);\r
 \r
        static bool FormatTextInRichEditControl(CWnd * pWnd);\r
        static bool FindStyleChars(const CString& sText, TCHAR stylechar, int& start, int& end);\r
 \r

-       static bool BrowseRepository(CHistoryCombo& combo, CWnd * pParent, SVNRev& rev);\r
+       static bool BrowseRepository(CHistoryCombo& combo, CWnd * pParent, GitRev& rev);\r

 \r
        static bool FileOpenSave(CString& path, int * filterindex, UINT title, UINT filter, bool bOpen, HWND hwndOwner = NULL);\r
 \r
 \r
        static bool FileOpenSave(CString& path, int * filterindex, UINT title, UINT filter, bool bOpen, HWND hwndOwner = NULL);\r
 \r


@@ -143,22 +143,22 @@ public:
        /**\r
         * Replacement for SVNDiff::ShowUnifiedDiff(), but started as a separate process.\r
         */\r
        /**\r
         * Replacement for SVNDiff::ShowUnifiedDiff(), but started as a separate process.\r
         */\r

-       static bool StartShowUnifiedDiff(HWND hWnd, const CTSVNPath& url1, const SVNRev& rev1, \r
-                                                                       const CTSVNPath& url2, const SVNRev& rev2, \r
-                                                                       const SVNRev& peg = SVNRev(), const SVNRev& headpeg = SVNRev(),\r
+       static bool StartShowUnifiedDiff(HWND hWnd, const CTGitPath& url1, const GitRev& rev1, \r
+                                                                       const CTGitPath& url2, const GitRev& rev2, \r
+                                                                       const GitRev& peg = GitRev(), const GitRev& headpeg = GitRev(),\r

                                                                        bool bAlternateDiff = false,\r
                                                                        bool bIgnoreAncestry = false,\r
                                     bool /* blame */ = false);\r
 \r
        /**\r
                                                                        bool bAlternateDiff = false,\r
                                                                        bool bIgnoreAncestry = false,\r
                                     bool /* blame */ = false);\r
 \r
        /**\r

-        * Replacement for SVNDiff::ShowCompare(), but started as a separate process.\r
+        * Replacement for GitDiff::ShowCompare(), but started as a separate process.\r

         */\r
         */\r

-       static bool StartShowCompare(HWND hWnd, const CTSVNPath& url1, const SVNRev& rev1, \r
-                                                               const CTSVNPath& url2, const SVNRev& rev2, \r
-                                                               const SVNRev& peg = SVNRev(), const SVNRev& headpeg = SVNRev(),\r
+       static bool StartShowCompare(HWND hWnd, const CTGitPath& url1, const GitRev& rev1, \r
+                                                               const CTGitPath& url2, const GitRev& rev2, \r
+                                                               const GitRev& peg = GitRev(), const GitRev& headpeg = GitRev(),\r

                                                                bool bAlternateDiff = false, bool ignoreancestry = false,\r
                                                                bool blame = false);\r
 private:\r
                                                                bool bAlternateDiff = false, bool ignoreancestry = false,\r
                                                                bool blame = false);\r
 private:\r

-       static CString PickDiffTool(const CTSVNPath& file1, const CTSVNPath& file2);\r
-       static bool GetMimeType(const CTSVNPath& file, CString& mimetype);\r
+       static CString PickDiffTool(const CTGitPath& file1, const CTGitPath& file2);\r
+       static bool GetMimeType(const CTGitPath& file, CString& mimetype);\r

 };\r
 };\r

diff --git a/TortoiseProc/Commands/Command.cpp b/TortoiseProc/Commands/Command.cpp
index 8783bda..8481955 100644 (file)
--- a/TortoiseProc/Commands/Command.cpp
+++ b/TortoiseProc/Commands/Command.cpp
@@ -20,6 +20,7 @@
 #include "Command.h"\r
 \r
 #include "AboutCommand.h"\r
 #include "Command.h"\r
 \r
 #include "AboutCommand.h"\r

+#if 0\r

 #include "AddCommand.h"\r
 #include "BlameCommand.h"\r
 #include "CatCommand.h"\r
 #include "AddCommand.h"\r
 #include "BlameCommand.h"\r
 #include "CatCommand.h"\r


@@ -67,7 +68,7 @@
 #include "UpdateCheckCommand.h"\r
 #include "UpdateCommand.h"\r
 #include "UrlDiffCommand.h"\r
 #include "UpdateCheckCommand.h"\r
 #include "UpdateCommand.h"\r
 #include "UrlDiffCommand.h"\r

-\r
+#endif\r

 typedef enum\r
 {\r
        cmdAbout,\r
 typedef enum\r
 {\r
        cmdAbout,\r


@@ -118,11 +119,11 @@ typedef enum
        cmdUpdate,\r
        cmdUpdateCheck,\r
        cmdUrlDiff,\r
        cmdUpdate,\r
        cmdUpdateCheck,\r
        cmdUrlDiff,\r

-} TSVNCommand;\r
+} TGitCommand;\r

 \r
 static const struct CommandInfo\r
 {\r
 \r
 static const struct CommandInfo\r
 {\r

-       TSVNCommand command;\r
+       TGitCommand command;\r

        LPCTSTR pCommandName;\r
 } commandInfo[] = \r
 {\r
        LPCTSTR pCommandName;\r
 } commandInfo[] = \r
 {\r


@@ -182,7 +183,7 @@ static const struct CommandInfo
 Command * CommandServer::GetCommand(const CString& sCmd)\r
 {\r
        // Look up the command\r
 Command * CommandServer::GetCommand(const CString& sCmd)\r
 {\r
        // Look up the command\r

-       TSVNCommand command = cmdAbout;         // Something harmless as a default\r
+       TGitCommand command = cmdAbout;         // Something harmless as a default\r

        for (int nCommand = 0; nCommand < (sizeof(commandInfo)/sizeof(commandInfo[0])); nCommand++)\r
        {\r
                if (sCmd.Compare(commandInfo[nCommand].pCommandName) == 0)\r
        for (int nCommand = 0; nCommand < (sizeof(commandInfo)/sizeof(commandInfo[0])); nCommand++)\r
        {\r
                if (sCmd.Compare(commandInfo[nCommand].pCommandName) == 0)\r


@@ -201,6 +202,7 @@ Command * CommandServer::GetCommand(const CString& sCmd)
        {\r
        case cmdAbout:\r
                return new AboutCommand;\r
        {\r
        case cmdAbout:\r
                return new AboutCommand;\r

+#if 0\r

        case cmdAdd:\r
                return new AddCommand;\r
        case cmdBlame:\r
        case cmdAdd:\r
                return new AddCommand;\r
        case cmdBlame:\r


@@ -295,7 +297,7 @@ Command * CommandServer::GetCommand(const CString& sCmd)
                return new UpdateCheckCommand;\r
        case cmdUrlDiff:\r
                return new UrlDiffCommand;\r
                return new UpdateCheckCommand;\r
        case cmdUrlDiff:\r
                return new UrlDiffCommand;\r

-\r
+#endif\r

        default:\r
                return new AboutCommand;\r
        }\r
        default:\r
                return new AboutCommand;\r
        }\r

diff --git a/TortoiseProc/Commands/Command.h b/TortoiseProc/Commands/Command.h
index 37ded28..21c8f82 100644 (file)
--- a/TortoiseProc/Commands/Command.h
+++ b/TortoiseProc/Commands/Command.h
@@ -19,7 +19,7 @@
 #pragma once\r
 #include "TortoiseProc.h"\r
 #include "CmdLineParser.h"\r
 #pragma once\r
 #include "TortoiseProc.h"\r
 #include "CmdLineParser.h"\r

-#include "TSVNPath.h"\r
+#include "TGitPath.h"\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -37,12 +37,12 @@ public:
        virtual bool                    Execute() = 0;\r
 \r
        void                                    SetParser(const CCmdLineParser& p) {parser = p;}\r
        virtual bool                    Execute() = 0;\r
 \r
        void                                    SetParser(const CCmdLineParser& p) {parser = p;}\r

-       void                                    SetPaths(const CTSVNPathList& plist, const CTSVNPath path) {pathList = plist; cmdLinePath = path;}\r
+       void                                    SetPaths(const CTGitPathList& plist, const CTGitPath path) {pathList = plist; cmdLinePath = path;}\r

        void                                    SetExplorerHwnd(HWND hWnd) {hwndExplorer = hWnd;}\r
 protected:\r
        CCmdLineParser                  parser;\r
        void                                    SetExplorerHwnd(HWND hWnd) {hwndExplorer = hWnd;}\r
 protected:\r
        CCmdLineParser                  parser;\r

-       CTSVNPathList                   pathList;\r
-       CTSVNPath                               cmdLinePath;\r
+       CTGitPathList                   pathList;\r
+       CTGitPath                               cmdLinePath;\r

        HWND                                    hwndExplorer;\r
 };\r
 \r
        HWND                                    hwndExplorer;\r
 };\r
 \r

diff --git a/TortoiseProc/Commands/ConflictEditorCommand.h b/TortoiseProc/Commands/ConflictEditorCommand.h
index 0490032..0436705 100644 (file)
--- a/TortoiseProc/Commands/ConflictEditorCommand.h
+++ b/TortoiseProc/Commands/ConflictEditorCommand.h
@@ -19,7 +19,7 @@
 #pragma once\r
 #include "Command.h"\r
 \r
 #pragma once\r
 #include "Command.h"\r
 \r

-#include "SVNDiff.h"\r
+//#include "SVNDiff.h"\r

 \r
 /**\r
  * \ingroup TortoiseProc\r
 \r
 /**\r
  * \ingroup TortoiseProc\r


@@ -33,7 +33,7 @@ public:
         */\r
        virtual bool                    Execute()\r
        {\r
         */\r
        virtual bool                    Execute()\r
        {\r

-               return SVNDiff::StartConflictEditor(cmdLinePath);\r
+//             return SVNDiff::StartConflictEditor(cmdLinePath);\r

        }\r
 };\r
 \r
        }\r
 };\r
 \r

diff --git a/TortoiseProc/Commands/CreateRepositoryCommand.h b/TortoiseProc/Commands/CreateRepositoryCommand.h
index 59c2983..c815730 100644 (file)
--- a/TortoiseProc/Commands/CreateRepositoryCommand.h
+++ b/TortoiseProc/Commands/CreateRepositoryCommand.h
@@ -33,6 +33,7 @@ public:
         */\r
        virtual bool                    Execute()\r
        {\r
         */\r
        virtual bool                    Execute()\r
        {\r

+#if 0\r

                if (!SVN::CreateRepository(cmdLinePath))\r
                {\r
                        CMessageBox::Show(hwndExplorer, IDS_PROC_REPOCREATEERR, IDS_APPNAME, MB_ICONERROR);\r
                if (!SVN::CreateRepository(cmdLinePath))\r
                {\r
                        CMessageBox::Show(hwndExplorer, IDS_PROC_REPOCREATEERR, IDS_APPNAME, MB_ICONERROR);\r


@@ -42,6 +43,7 @@ public:
                {\r
                        CMessageBox::Show(hwndExplorer, IDS_PROC_REPOCREATEFINISHED, IDS_APPNAME, MB_OK | MB_ICONINFORMATION);\r
                }\r
                {\r
                        CMessageBox::Show(hwndExplorer, IDS_PROC_REPOCREATEFINISHED, IDS_APPNAME, MB_OK | MB_ICONINFORMATION);\r
                }\r

+#endif\r

                return true;\r
        }\r
 };\r
                return true;\r
        }\r
 };\r

diff --git a/TortoiseProc/TortoiseProc.cpp b/TortoiseProc/TortoiseProc.cpp
index 956488a..11c91ec 100644 (file)
--- a/TortoiseProc/TortoiseProc.cpp
+++ b/TortoiseProc/TortoiseProc.cpp
@@ -20,29 +20,29 @@
 //#include "vld.h"\r
 #include "TortoiseProc.h"\r
 #include "SysImageList.h"\r
 //#include "vld.h"\r
 #include "TortoiseProc.h"\r
 #include "SysImageList.h"\r

-#include "CrashReport.h"\r
+//#include "CrashReport.h"\r

 #include "CmdLineParser.h"\r
 #include "Hooks.h"\r
 #include "AppUtils.h"\r
 #include "PathUtils.h"\r
 #include "UnicodeUtils.h"\r
 #include "MessageBox.h"\r
 #include "CmdLineParser.h"\r
 #include "Hooks.h"\r
 #include "AppUtils.h"\r
 #include "PathUtils.h"\r
 #include "UnicodeUtils.h"\r
 #include "MessageBox.h"\r

-#include "libintl.h"\r
+//#include "libintl.h"\r

 #include "DirFileEnum.h"\r
 #include "DirFileEnum.h"\r

-#include "SoundUtils.h"\r
-#include "SVN.h"\r
-#include "SVNAdminDir.h"\r
-#include "SVNGlobal.h"\r
-#include "svn_types.h"\r
-#include "svn_dso.h"\r
-#include <openssl/ssl.h>\r
-#include <openssl/err.h>\r
+//#include "SoundUtils.h"\r
+//#include "SVN.h"\r
+#include "GitAdminDir.h"\r
+//#include "SVNGlobal.h"\r
+//#include "svn_types.h"\r
+//#include "svn_dso.h"\r
+//#include <openssl/ssl.h>\r
+//#include <openssl/err.h>\r

 \r
 #include "Commands\Command.h"\r
 \r
 #include "..\version.h"\r
 #define STRUCT_IOVEC_DEFINED\r
 \r
 #include "Commands\Command.h"\r
 \r
 #include "..\version.h"\r
 #define STRUCT_IOVEC_DEFINED\r

-#include "sasl.h"\r
+//#include "sasl.h"\r

 \r
 #ifdef _DEBUG\r
 #define new DEBUG_NEW\r
 \r
 #ifdef _DEBUG\r
 #define new DEBUG_NEW\r


@@ -55,7 +55,7 @@ BEGIN_MESSAGE_MAP(CTortoiseProcApp, CWinAppEx)
        ON_COMMAND(ID_HELP, CWinAppEx::OnHelp)\r
 END_MESSAGE_MAP()\r
 \r
        ON_COMMAND(ID_HELP, CWinAppEx::OnHelp)\r
 END_MESSAGE_MAP()\r
 \r

-\r
+CString g_version;\r

 \r
 //////////////////////////////////////////////////////////////////////////\r
 \r
 \r
 //////////////////////////////////////////////////////////////////////////\r
 \r


@@ -63,12 +63,13 @@ CTortoiseProcApp::CTortoiseProcApp()
 {\r
        EnableHtmlHelp();\r
        int argc = 0;\r
 {\r
        EnableHtmlHelp();\r
        int argc = 0;\r

+       g_version=_T("abc");\r

        const char* const * argv = NULL;\r
        const char* const * argv = NULL;\r

-       apr_app_initialize(&argc, &argv, NULL);\r
-       svn_dso_initialize2();\r
+//     apr_app_initialize(&argc, &argv, NULL);\r
+//     svn_dso_initialize2();\r

        SYS_IMAGE_LIST();\r
        SYS_IMAGE_LIST();\r

-       CHooks::Create();\r
-       g_SVNAdminDir.Init();\r
+//     CHooks::Create();\r
+       g_GitAdminDir.Init();\r

        m_bLoadUserToolbars = FALSE;\r
        m_bSaveState = FALSE;\r
        retSuccess = false;\r
        m_bLoadUserToolbars = FALSE;\r
        m_bSaveState = FALSE;\r
        retSuccess = false;\r


@@ -76,22 +77,22 @@ CTortoiseProcApp::CTortoiseProcApp()
 \r
 CTortoiseProcApp::~CTortoiseProcApp()\r
 {\r
 \r
 CTortoiseProcApp::~CTortoiseProcApp()\r
 {\r

-       sasl_done();\r
+//     sasl_done();\r

 \r
        // global application exit cleanup (after all SSL activity is shutdown)\r
        // we have to clean up SSL ourselves, since neon doesn't do that (can't do it)\r
        // because those cleanup functions work globally per process.\r
 \r
        // global application exit cleanup (after all SSL activity is shutdown)\r
        // we have to clean up SSL ourselves, since neon doesn't do that (can't do it)\r
        // because those cleanup functions work globally per process.\r

-       ERR_free_strings();\r
-       EVP_cleanup();\r
-       CRYPTO_cleanup_all_ex_data();\r
+       //ERR_free_strings();\r
+       //EVP_cleanup();\r
+       //CRYPTO_cleanup_all_ex_data();\r

 \r
        // since it is undefined *when* the global object SVNAdminDir is\r
        // destroyed, we tell it to destroy the memory pools and terminate apr\r
        // *now* instead of later when the object itself is destroyed.\r
 \r
        // since it is undefined *when* the global object SVNAdminDir is\r
        // destroyed, we tell it to destroy the memory pools and terminate apr\r
        // *now* instead of later when the object itself is destroyed.\r

-       g_SVNAdminDir.Close();\r
-       CHooks::Destroy();\r
+       g_GitAdminDir.Close();\r
+//     CHooks::Destroy();\r

        SYS_IMAGE_LIST().Cleanup();\r
        SYS_IMAGE_LIST().Cleanup();\r

-       apr_terminate();\r
+       //apr_terminate();\r

 }\r
 \r
 // The one and only CTortoiseProcApp object\r
 }\r
 \r
 // The one and only CTortoiseProcApp object\r


@@ -99,7 +100,7 @@ CTortoiseProcApp theApp;
 HWND hWndExplorer;\r
 CString sOrigCWD;\r
 \r
 HWND hWndExplorer;\r
 CString sOrigCWD;\r
 \r

-CCrashReport crasher("crashreports@tortoisesvn.tigris.org", "Crash Report for TortoiseSVN " APP_X64_STRING " : " STRPRODUCTVER, TRUE);// crash\r
+//CCrashReport crasher("crashreports@tortoisesvn.tigris.org", "Crash Report for TortoiseSVN " APP_X64_STRING " : " STRPRODUCTVER, TRUE);// crash\r

 \r
 // CTortoiseProcApp initialization\r
 \r
 \r
 // CTortoiseProcApp initialization\r
 \r


@@ -115,8 +116,8 @@ BOOL CTortoiseProcApp::InitInstance()
        CString langDll;\r
        CStringA langpath = CStringA(CPathUtils::GetAppParentDirectory());\r
        langpath += "Languages";\r
        CString langDll;\r
        CStringA langpath = CStringA(CPathUtils::GetAppParentDirectory());\r
        langpath += "Languages";\r

-       bindtextdomain("subversion", (LPCSTR)langpath);\r
-       bind_textdomain_codeset("subversion", "UTF-8");\r
+//     bindtextdomain("subversion", (LPCSTR)langpath);\r
+//     bind_textdomain_codeset("subversion", "UTF-8");\r

        HINSTANCE hInst = NULL;\r
        do\r
        {\r
        HINSTANCE hInst = NULL;\r
        do\r
        {\r


@@ -231,10 +232,11 @@ BOOL CTortoiseProcApp::InitInstance()
                return FALSE;\r
        }\r
 \r
                return FALSE;\r
        }\r
 \r

-       CTSVNPath cmdLinePath;\r
-       CTSVNPathList pathList;\r
+       CTGitPath cmdLinePath;\r
+       CTGitPathList pathList;\r

        if ( parser.HasKey(_T("pathfile")) )\r
        {\r
        if ( parser.HasKey(_T("pathfile")) )\r
        {\r

+#if 0\r

                CString sPathfileArgument = CPathUtils::GetLongPathname(parser.GetVal(_T("pathfile")));\r
                cmdLinePath.SetFromUnknown(sPathfileArgument);\r
                if (pathList.LoadFromFile(cmdLinePath)==false)\r
                CString sPathfileArgument = CPathUtils::GetLongPathname(parser.GetVal(_T("pathfile")));\r
                cmdLinePath.SetFromUnknown(sPathfileArgument);\r
                if (pathList.LoadFromFile(cmdLinePath)==false)\r


@@ -247,13 +249,16 @@ BOOL CTortoiseProcApp::InitInstance()
                // This was a path to a temporary file - it's got no meaning now, and\r
                // anybody who uses it again is in for a problem...\r
                cmdLinePath.Reset();\r
                // This was a path to a temporary file - it's got no meaning now, and\r
                // anybody who uses it again is in for a problem...\r
                cmdLinePath.Reset();\r

+#endif\r

        }\r
        else\r
        {\r
        }\r
        else\r
        {\r

+#if 0\r

                CString sPathArgument = CPathUtils::GetLongPathname(parser.GetVal(_T("path")));\r
                int asterisk = sPathArgument.Find('*');\r
                cmdLinePath.SetFromUnknown(asterisk >= 0 ? sPathArgument.Left(asterisk) : sPathArgument);\r
                CString sPathArgument = CPathUtils::GetLongPathname(parser.GetVal(_T("path")));\r
                int asterisk = sPathArgument.Find('*');\r
                cmdLinePath.SetFromUnknown(asterisk >= 0 ? sPathArgument.Left(asterisk) : sPathArgument);\r

-               pathList.LoadFromAsteriskSeparatedString(sPathArgument);\r
+               //pathList.LoadFromAsteriskSeparatedString(sPathArgument);\r
+#endif\r

        }\r
        \r
        hWndExplorer = NULL;\r
        }\r
        \r
        hWndExplorer = NULL;\r


@@ -317,7 +322,7 @@ BOOL CTortoiseProcApp::InitInstance()
                                        GetModuleFileName(NULL, com, MAX_PATH);\r
                                        _tcscat_s(com, MAX_PATH+100, _T(" /command:updatecheck"));\r
 \r
                                        GetModuleFileName(NULL, com, MAX_PATH);\r
                                        _tcscat_s(com, MAX_PATH+100, _T(" /command:updatecheck"));\r
 \r

-                                       CAppUtils::LaunchApplication(com, 0, false);\r
+                                       //CAppUtils::LaunchApplication(com, 0, false);\r

                                }\r
                        }\r
                }\r
                                }\r
                        }\r
                }\r


@@ -327,19 +332,20 @@ BOOL CTortoiseProcApp::InitInstance()
        {\r
                // the user can override the location of the Subversion config directory here\r
                CString sConfigDir = parser.GetVal(_T("configdir"));\r
        {\r
                // the user can override the location of the Subversion config directory here\r
                CString sConfigDir = parser.GetVal(_T("configdir"));\r

-               g_SVNGlobal.SetConfigDir(sConfigDir);\r
+//             g_GitGlobal.SetConfigDir(sConfigDir);\r

        }\r
        // to avoid that SASL will look for and load its plugin dlls all around the\r
        // system, we set the path here.\r
        // Note that SASL doesn't have to be initialized yet for this to work\r
        }\r
        // to avoid that SASL will look for and load its plugin dlls all around the\r
        // system, we set the path here.\r
        // Note that SASL doesn't have to be initialized yet for this to work\r

-       sasl_set_path(SASL_PATH_TYPE_PLUGIN, (LPSTR)(LPCSTR)CUnicodeUtils::GetUTF8(CPathUtils::GetAppDirectory().TrimRight('\\')));\r
+//     sasl_set_path(SASL_PATH_TYPE_PLUGIN, (LPSTR)(LPCSTR)CUnicodeUtils::GetUTF8(CPathUtils::GetAppDirectory().TrimRight('\\')));\r

 \r
 \r

-       HANDLE TSVNMutex = ::CreateMutex(NULL, FALSE, _T("TortoiseProc.exe"));  \r
+       HANDLE TSVNMutex = ::CreateMutex(NULL, FALSE, _T("TortoiseGitProc.exe"));       \r

        {\r
        {\r

-               CString err = SVN::CheckConfigFile();\r
+#if 0\r
+               CString err = Git::CheckConfigFile();\r

                if (!err.IsEmpty())\r
                {\r
                if (!err.IsEmpty())\r
                {\r

-                       CMessageBox::Show(hWndExplorer, err, _T("TortoiseSVN"), MB_ICONERROR);\r
+                       CMessageBox::Show(hWndExplorer, err, _T("TortoiseGit"), MB_ICONERROR);\r

                        // Normally, we give-up and exit at this point, but there is a trap here\r
                        // in that the user might need to use the settings dialog to edit the config file.\r
                        if (CString(parser.GetVal(_T("command"))).Compare(_T("settings"))==0)\r
                        // Normally, we give-up and exit at this point, but there is a trap here\r
                        // in that the user might need to use the settings dialog to edit the config file.\r
                        if (CString(parser.GetVal(_T("command"))).Compare(_T("settings"))==0)\r


@@ -348,11 +354,12 @@ BOOL CTortoiseProcApp::InitInstance()
                                TCHAR buf[MAX_PATH];\r
                                SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, buf);\r
                                CString path = buf;\r
                                TCHAR buf[MAX_PATH];\r
                                SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, buf);\r
                                CString path = buf;\r

-                               path += _T("\\Subversion\\config");\r
+                               path += _T("\\Git\\config");\r

                                CAppUtils::StartTextViewer(path);\r
                                return FALSE;\r
                        }\r
                }\r
                                CAppUtils::StartTextViewer(path);\r
                                return FALSE;\r
                        }\r
                }\r

+#endif\r

        }\r
 \r
        // execute the requested command\r
        }\r
 \r
        // execute the requested command\r


@@ -442,7 +449,7 @@ void CTortoiseProcApp::CheckUpgrade()
                newregval = !regval;\r
                regval.removeValue();\r
        }\r
                newregval = !regval;\r
                regval.removeValue();\r
        }\r

-\r
+#if 0\r

        if (lVersion <= 0x01010300)\r
        {\r
                CSoundUtils::RegisterTSVNSounds();\r
        if (lVersion <= 0x01010300)\r
        {\r
                CSoundUtils::RegisterTSVNSounds();\r


@@ -452,7 +459,7 @@ void CTortoiseProcApp::CheckUpgrade()
                // remove the external cache key\r
                CRegDWORD(_T("Software\\TortoiseSVN\\ExternalCache")).removeValue();\r
        }\r
                // remove the external cache key\r
                CRegDWORD(_T("Software\\TortoiseSVN\\ExternalCache")).removeValue();\r
        }\r

-       \r
+#endif \r

        if (lVersion <= 0x01020200)\r
        {\r
                // upgrade to > 1.2.3 means the doc diff scripts changed from vbs to js\r
        if (lVersion <= 0x01020200)\r
        {\r
                // upgrade to > 1.2.3 means the doc diff scripts changed from vbs to js\r


@@ -551,7 +558,7 @@ void CTortoiseProcApp::EnableCrashHandler()
        CTimeSpan timediff = now-compiletime;\r
        if (timediff.GetDays() > 3*31)\r
        {\r
        CTimeSpan timediff = now-compiletime;\r
        if (timediff.GetDays() > 3*31)\r
        {\r

-               crasher.Enable(FALSE);\r
+//             crasher.Enable(FALSE);\r

        }\r
 }\r
 \r
        }\r
 }\r
 \r

diff --git a/TortoiseProc/TortoiseProc.vcproj b/TortoiseProc/TortoiseProc.vcproj
index 7f7f0e9..9996164 100644 (file)
--- a/TortoiseProc/TortoiseProc.vcproj
+++ b/TortoiseProc/TortoiseProc.vcproj
@@ -21,11 +21,11 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r

-                       OutputDirectory="..\..\bin\Debug\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseProc\Debug"\r
+                       OutputDirectory="..\bin\Debug\bin"\r
+                       IntermediateDirectory="..\obj\TortoiseProc\Debug"\r

                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r

-                       UseOfATL="0"\r
+                       UseOfATL="1"\r

                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r


@@ -48,7 +48,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;..\TortoiseShell;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r
+                               AdditionalIncludeDirectories="&quot;../ext/ResizableLib&quot;,&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;..\TortoiseShell;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r

                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="2"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="2"\r


@@ -74,9 +74,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="delayimp.lib Crypt32.lib Secur32.lib wininet.lib shfolder.lib shell32.lib comctl32.lib mswsock.lib ws2_32.lib rpcrt4.lib shlwapi.lib Version.lib gdiplus.lib ../../obj\ResizableLib\Debug\ResizableLib.lib ../../obj\LogCacheLib\Debug\LogCacheLib.lib ../../ext/Subversion\debug_win32\libsvn_repos.lib ../../ext/Subversion\debug_win32\libsvn_diff.lib ../../ext/Subversion\debug_win32\libsvn_fs.lib ../../ext/Subversion\debug_win32\libsvn_fs_fs.lib ../../ext/Subversion\debug_win32\libsvn_fs_util.lib ../../ext/Subversion\debug_win32\libsvn_ra_neon.lib ../../ext/Subversion\debug_win32\libsvn_ra_serf.lib ../../ext/Subversion\debug_win32\libsvn_ra_local.lib ../../ext/Subversion\debug_win32\libsvn_ra.lib ../../ext/Subversion\debug_win32\libsvn_ra_svn.lib ../../ext/neon\debug_win32\libneon.lib ../../ext/serf\debug_win32\libserf.lib ../../ext/Subversion\debug_win32\libsvn_wc.lib ../../ext/Subversion\debug_win32\libsvn_subr.lib ../../ext/Subversion\debug_win32\libsvn_client.lib ../../ext/Subversion\debug_win32\libsvn_delta.lib ../../ext/apr\debug_win32\libapr_tsvn.lib ../../ext/cyrus-SASL\debug_win32\libsasl.lib ../../ext/apr-util\debug_win32\libaprutil_tsvn.lib ../../ext/apr-util\xml\expat\lib\debug_win32\xml.lib ../../ext/libintl/libintl3-win32/lib/intl3_tsvn.lib"\r
+                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r

                                LinkIncremental="2"\r
                                LinkIncremental="2"\r

-                               IgnoreDefaultLibraryNames="shell32;msvcrt.lib"\r
+                               IgnoreDefaultLibraryNames=""\r

                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r


@@ -107,13 +107,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Debug|x64"\r
-                       OutputDirectory="..\..\bin\Debug64\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseProc\Debug64"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\Release\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseProc\Release"\r

                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r

-                       UseOfATL="0"\r

                        CharacterSet="1"\r
                        CharacterSet="1"\r

+                       WholeProgramOptimization="1"\r

                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r


@@ -129,18 +129,21 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r

                                MkTypLibCompatible="false"\r
                                MkTypLibCompatible="false"\r

-                               TargetEnvironment="3"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="0"\r
+                               Optimization="1"\r
+                               InlineFunctionExpansion="1"\r
+                               FavorSizeOrSpeed="2"\r

                                AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;..\TortoiseShell;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r
                                AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;..\TortoiseShell;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r

-                               PreprocessorDefinitions="WIN64;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
-                               MinimalRebuild="true"\r
+                               PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"\r
+                               StringPooling="true"\r
+                               MinimalRebuild="false"\r

                                ExceptionHandling="2"\r
                                ExceptionHandling="2"\r

-                               RuntimeLibrary="3"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="false"\r

                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                RuntimeTypeInfo="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                RuntimeTypeInfo="true"\r


@@ -153,7 +156,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;..\TortoiseShell"\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;..\TortoiseShell"\r
                        />\r


@@ -162,15 +165,19 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="delayimp.lib Crypt32.lib Secur32.lib wininet.lib shfolder.lib shell32.lib comctl32.lib mswsock.lib ws2_32.lib rpcrt4.lib shlwapi.lib Version.lib gdiplus.lib ../../obj\ResizableLib\Debug64\ResizableLib.lib ../../obj\LogCacheLib\Debug64\LogCacheLib.lib ../../ext/Subversion\debug_x64\libsvn_repos.lib ../../ext/Subversion\debug_x64\libsvn_diff.lib ../../ext/Subversion\debug_x64\libsvn_fs.lib ../../ext/Subversion\debug_x64\libsvn_fs_fs.lib ../../ext/Subversion\debug_x64\libsvn_fs_util.lib ../../ext/Subversion\debug_x64\libsvn_ra_neon.lib ../../ext/Subversion\debug_x64\libsvn_ra_serf.lib ../../ext/Subversion\debug_x64\libsvn_ra_local.lib ../../ext/Subversion\debug_x64\libsvn_ra.lib ../../ext/Subversion\debug_x64\libsvn_ra_svn.lib ../../ext/neon\debug_x64\libneon.lib ../../ext/serf\debug_x64\libserf.lib ../../ext/Subversion\debug_x64\libsvn_wc.lib ../../ext/Subversion\debug_x64\libsvn_subr.lib ../../ext/Subversion\debug_x64\libsvn_client.lib ../../ext/Subversion\debug_x64\libsvn_delta.lib ../../ext/apr\debug_x64\libapr_tsvn.lib ../../ext/apr-util\debug_x64\libaprutil_tsvn.lib ../../ext/apr-util\xml\expat\lib\debug_x64\xml.lib ../../ext/libintl/libintl3-x64/lib/intl3_tsvn.lib ../../ext/cyrus-SASL\debug_x64\libsasl.lib"\r
-                               LinkIncremental="2"\r
-                               IgnoreDefaultLibraryNames="shell32;msvcrt.lib"\r
+                               AdditionalDependencies="delayimp.lib Crypt32.lib Secur32.lib wininet.lib shfolder.lib shell32.lib comctl32.lib mswsock.lib ws2_32.lib rpcrt4.lib shlwapi.lib Version.lib gdiplus.lib ../../obj/ResizableLib/Release/ResizableLib.Lib ../../obj\LogCacheLib\Release\LogCacheLib.lib ../../ext/Subversion\release_win32\libsvn_repos.lib ../../ext/Subversion\release_win32\libsvn_diff.lib ../../ext/Subversion\release_win32\libsvn_fs.lib ../../ext/Subversion\release_win32\libsvn_fs_fs.lib ../../ext/Subversion\release_win32\libsvn_fs_util.lib ../../ext/Subversion\release_win32\libsvn_ra_neon.lib ../../ext/Subversion\release_win32\libsvn_ra_serf.lib ../../ext/Subversion\release_win32\libsvn_ra_local.lib ../../ext/Subversion\release_win32\libsvn_ra.lib ../../ext/Subversion\release_win32\libsvn_ra_svn.lib ../../ext/neon\release_win32\libneon.lib ../../ext/serf\release_win32\libserf.lib ../../ext/Subversion\release_win32\libsvn_wc.lib ../../ext/Subversion\release_win32\libsvn_subr.lib ../../ext/Subversion\release_win32\libsvn_client.lib ../../ext/Subversion\release_win32\libsvn_delta.lib ../../ext/apr\release_win32\libapr_tsvn.lib ../../ext/apr-util\release_win32\libaprutil_tsvn.lib ../../ext/apr-util\xml\expat\lib\release_win32\xml.lib ../../ext/libintl/libintl3-win32/lib/intl3_tsvn.lib ../../ext/cyrus-SASL\release_win32\libsasl.lib"\r
+                               LinkIncremental="1"\r
+                               IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;"\r

                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r

+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="0"\r

                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r

-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
+                               Profile="true"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r


@@ -195,13 +202,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\Release\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseProc\Release"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\Debug64\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseProc\Debug64"\r

                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r

+                       UseOfATL="0"\r

                        CharacterSet="1"\r
                        CharacterSet="1"\r

-                       WholeProgramOptimization="1"\r

                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r


@@ -217,21 +224,18 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r

                                MkTypLibCompatible="false"\r
                                MkTypLibCompatible="false"\r

+                               TargetEnvironment="3"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="1"\r
-                               InlineFunctionExpansion="1"\r
-                               FavorSizeOrSpeed="2"\r
+                               Optimization="0"\r

                                AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;..\TortoiseShell;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r
                                AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;..\TortoiseShell;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r

-                               PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"\r
-                               StringPooling="true"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="WIN64;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
+                               MinimalRebuild="true"\r

                                ExceptionHandling="2"\r
                                ExceptionHandling="2"\r

-                               RuntimeLibrary="2"\r
-                               BufferSecurityCheck="false"\r
+                               RuntimeLibrary="3"\r

                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                RuntimeTypeInfo="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                RuntimeTypeInfo="true"\r


@@ -244,7 +248,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;..\TortoiseShell"\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;..\TortoiseShell"\r
                        />\r


@@ -253,19 +257,15 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="delayimp.lib Crypt32.lib Secur32.lib wininet.lib shfolder.lib shell32.lib comctl32.lib mswsock.lib ws2_32.lib rpcrt4.lib shlwapi.lib Version.lib gdiplus.lib ../../obj/ResizableLib/Release/ResizableLib.Lib ../../obj\LogCacheLib\Release\LogCacheLib.lib ../../ext/Subversion\release_win32\libsvn_repos.lib ../../ext/Subversion\release_win32\libsvn_diff.lib ../../ext/Subversion\release_win32\libsvn_fs.lib ../../ext/Subversion\release_win32\libsvn_fs_fs.lib ../../ext/Subversion\release_win32\libsvn_fs_util.lib ../../ext/Subversion\release_win32\libsvn_ra_neon.lib ../../ext/Subversion\release_win32\libsvn_ra_serf.lib ../../ext/Subversion\release_win32\libsvn_ra_local.lib ../../ext/Subversion\release_win32\libsvn_ra.lib ../../ext/Subversion\release_win32\libsvn_ra_svn.lib ../../ext/neon\release_win32\libneon.lib ../../ext/serf\release_win32\libserf.lib ../../ext/Subversion\release_win32\libsvn_wc.lib ../../ext/Subversion\release_win32\libsvn_subr.lib ../../ext/Subversion\release_win32\libsvn_client.lib ../../ext/Subversion\release_win32\libsvn_delta.lib ../../ext/apr\release_win32\libapr_tsvn.lib ../../ext/apr-util\release_win32\libaprutil_tsvn.lib ../../ext/apr-util\xml\expat\lib\release_win32\xml.lib ../../ext/libintl/libintl3-win32/lib/intl3_tsvn.lib ../../ext/cyrus-SASL\release_win32\libsasl.lib"\r
-                               LinkIncremental="1"\r
-                               IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;"\r
+                               AdditionalDependencies="delayimp.lib Crypt32.lib Secur32.lib wininet.lib shfolder.lib shell32.lib comctl32.lib mswsock.lib ws2_32.lib rpcrt4.lib shlwapi.lib Version.lib gdiplus.lib ../../obj\ResizableLib\Debug64\ResizableLib.lib ../../obj\LogCacheLib\Debug64\LogCacheLib.lib ../../ext/Subversion\debug_x64\libsvn_repos.lib ../../ext/Subversion\debug_x64\libsvn_diff.lib ../../ext/Subversion\debug_x64\libsvn_fs.lib ../../ext/Subversion\debug_x64\libsvn_fs_fs.lib ../../ext/Subversion\debug_x64\libsvn_fs_util.lib ../../ext/Subversion\debug_x64\libsvn_ra_neon.lib ../../ext/Subversion\debug_x64\libsvn_ra_serf.lib ../../ext/Subversion\debug_x64\libsvn_ra_local.lib ../../ext/Subversion\debug_x64\libsvn_ra.lib ../../ext/Subversion\debug_x64\libsvn_ra_svn.lib ../../ext/neon\debug_x64\libneon.lib ../../ext/serf\debug_x64\libserf.lib ../../ext/Subversion\debug_x64\libsvn_wc.lib ../../ext/Subversion\debug_x64\libsvn_subr.lib ../../ext/Subversion\debug_x64\libsvn_client.lib ../../ext/Subversion\debug_x64\libsvn_delta.lib ../../ext/apr\debug_x64\libapr_tsvn.lib ../../ext/apr-util\debug_x64\libaprutil_tsvn.lib ../../ext/apr-util\xml\expat\lib\debug_x64\xml.lib ../../ext/libintl/libintl3-x64/lib/intl3_tsvn.lib ../../ext/cyrus-SASL\debug_x64\libsasl.lib"\r
+                               LinkIncremental="2"\r
+                               IgnoreDefaultLibraryNames="shell32;msvcrt.lib"\r

                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r

-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               OptimizeForWindows98="0"\r

                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r

-                               TargetMachine="1"\r
-                               Profile="true"\r
+                               TargetMachine="17"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r


@@ -392,1096 +392,20 @@
                        Name="Utils"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;h;hpp;hxx;hm;inl;inc"\r
                        >\r
                        Name="Utils"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;h;hpp;hxx;hm;inl;inc"\r
                        >\r

-                       <File\r
-                               RelativePath="..\Utils\ProfilingInfo.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Utils\ProfilingInfo.h"\r
-                               >\r
-                       </File>\r

                        <Filter\r
                                Name="General"\r
                                >\r
                        <Filter\r
                                Name="General"\r
                                >\r

-                               <File\r
-                                       RelativePath=".\AppUtils.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\AppUtils.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\BugTraqAssociations.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\BugTraqAssociations.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\TSVNCache\CacheInterface.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\CmdLineParser.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\CmdLineParser.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Colors.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Colors.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\DirFileEnum.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\DirFileEnum.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\DragDropImpl.cpp"\r
-                                       >\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       UsePrecompiledHeader="0"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Debug|x64"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       UsePrecompiledHeader="0"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       UsePrecompiledHeader="0"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release|x64"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       UsePrecompiledHeader="0"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\DragDropImpl.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\DropFiles.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\DropFiles.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\HighResClock.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\Hooks.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\Hooks.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\LogFile.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\LogFile.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\PathUtils.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\PathUtils.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\PathWatcher.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\PathWatcher.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\PersonalDictionary.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\PersonalDictionary.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\ProjectProperties.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\ProjectProperties.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\QuickHash.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\QuickHashMap.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\RegHistory.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\RegHistory.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\Registry.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\registry.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\ShellUpdater.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\ShellUpdater.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\SoundUtils.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\SoundUtils.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\stdex_vector.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\StdioFileT.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\StdioFileT.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\StringUtils.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\StringUtils.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\SysImageList.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\SysImageList.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\TempFile.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\TempFile.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Svn\TSVNPath.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Svn\TSVNPath.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\UnicodeUtils.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\UnicodeUtils.h"\r
-                                       >\r
-                               </File>\r

                        </Filter>\r
                        <Filter\r
                                Name="UI"\r
                                >\r
                        </Filter>\r
                        <Filter\r
                                Name="UI"\r
                                >\r

-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\Balloon.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\Balloon.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\BrowseFolder.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\BrowseFolder.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\BufferDC.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\BufferDC.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\Cursor.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\DIB.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\DIB.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\ExtTextOutFL.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\FileDropEdit.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\FileDropEdit.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\FilterEdit.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\FilterEdit.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\Gradient.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\Gradient.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\HintListCtrl.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\HintListCtrl.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\HistoryCombo.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\HistoryCombo.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\HTMLFormatter.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\HTMLFormatter.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\HyperLink.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\HyperLink.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\IconMenu.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\IconMenu.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\MemDC.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\MenuButton.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\MenuButton.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\MessageBox.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\MessageBox.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\MyGraph.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\MyGraph.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\OddButton.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\OddButton.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\ProgressDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\ProgressDlg.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\SciEdit.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\SciEdit.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\SplitterControl.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\SplitterControl.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\StandAloneDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\StandAloneDlg.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\Tooltip.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\Tooltip.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\WaitCursorEx.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\WaitCursorEx.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\WaterEffect.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\WaterEffect.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\XPImageButton.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\XPImageButton.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\XPTheme.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\Utils\MiscUI\XPTheme.h"\r
-                                       >\r
-                               </File>\r

                        </Filter>\r
                        <Filter\r
                                Name="3rd Party"\r
                                >\r
                        </Filter>\r
                        <Filter\r
                                Name="3rd Party"\r
                                >\r

-                               <Filter\r
-                                       Name="hunspell"\r
-                                       >\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\affentry.cxx"\r
-                                               >\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\affentry.hxx"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\affixmgr.cxx"\r
-                                               >\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\affixmgr.hxx"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\atypes.hxx"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\baseaffix.hxx"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\csutil.cxx"\r
-                                               >\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\csutil.hxx"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\dictmgr.cxx"\r
-                                               >\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\dictmgr.hxx"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\hashmgr.cxx"\r
-                                               >\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\hashmgr.hxx"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\htypes.hxx"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\hunspell.cxx"\r
-                                               >\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\hunspell.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\hunspell.hxx"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\langnum.hxx"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\mythes.cxx"\r
-                                               >\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\mythes.hxx"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\suggestmgr.cxx"\r
-                                               >\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\suggestmgr.hxx"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\..\ext\hunspell\utf_info.cxx"\r
-                                               >\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCLCompilerTool"\r
-                                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
-                                                               UsePrecompiledHeader="0"\r
-                                                               WarningLevel="3"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                       </File>\r
-                               </Filter>\r
-                               <Filter\r
-                                       Name="TreePropSheet"\r
-                                       >\r
-                                       <File\r
-                                               RelativePath="..\Utils\MiscUI\HighColorTab.hpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\Utils\TreePropSheet\PropPageFrame.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\Utils\TreePropSheet\PropPageFrame.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\Utils\TreePropSheet\PropPageFrameDefault.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\Utils\TreePropSheet\PropPageFrameDefault.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\Utils\TreePropSheet\TreePropSheet.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\Utils\TreePropSheet\TreePropSheet.h"\r
-                                               >\r
-                                       </File>\r
-                               </Filter>\r

                        </Filter>\r
                </Filter>\r
                <Filter\r
                        </Filter>\r
                </Filter>\r
                <Filter\r

-                       Name="Subversion"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\SVN\SVN.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVN.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNAdminDir.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNAdminDir.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNConfig.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNConfig.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNDataObject.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNDataObject.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNDiff.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNDiff.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNError.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNError.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNGlobal.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNGlobal.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNHelpers.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNHelpers.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNInfo.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNInfo.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNLogHelper.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNLogHelper.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNPrompt.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNPrompt.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNProperties.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNProperties.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNRev.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNRev.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNStatus.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNStatus.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNStatusListCtrl.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNStatusListCtrl.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNStatusListCtrlHelpers.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\TSVNAuth.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\TSVNAuth.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r

                        Name="Resource Files"\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest"\r
                        >\r
                        Name="Resource Files"\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest"\r
                        >\r


@@ -1562,11 +486,11 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath=".\copy.ico"\r
+                               RelativePath="..\Resources\copy.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\Resources\copy.ico"\r
+                               RelativePath=".\copy.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r


@@ -1594,11 +518,11 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r


@@ -1806,19 +730,19 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\Resources\open.ico"\r
+                               RelativePath=".\open.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath=".\open.ico"\r
+                               RelativePath="..\Resources\open.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r


@@ -1838,11 +762,11 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath=".\refresh.ico"\r
+                               RelativePath="..\Resources\refresh.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\Resources\refresh.ico"\r
+                               RelativePath=".\refresh.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r


@@ -1918,11 +842,11 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r


@@ -2010,11 +934,11 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r


@@ -2038,26 +962,6 @@
                                >\r
                        </File>\r
                        <Filter\r
                                >\r
                        </File>\r
                        <Filter\r

-                               Name="Commit"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\CommitCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\CommitCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\CommitDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\CommitDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r

                                Name="About"\r
                                >\r
                                <File\r
                                Name="About"\r
                                >\r
                                <File\r


@@ -2077,1448 +981,28 @@
                                        >\r
                                </File>\r
                        </Filter>\r
                                        >\r
                                </File>\r
                        </Filter>\r

-                       <Filter\r
-                               Name="Misc"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\CatCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\CatCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\ConflictEditorCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\CrashCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\CreateRepositoryCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\HelpCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\RebuildIconCacheCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\RebuildIconCacheCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\RTFMCommand.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Log"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\LogCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\LogCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\LogDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\LogDlg.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\LogDlgHelper.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\LogDlgHelper.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Checkout"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\CheckoutCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\CheckoutCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\CheckoutDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\CheckoutDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Export"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\ExportCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\ExportCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\ExportDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\ExportDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Copy"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\CopyCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\CopyCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\CopyDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\CopyDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Import"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\ImportCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\ImportCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="ImportDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="ImportDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Update"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\UpdateCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\UpdateCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="UpdateDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="UpdateDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Add"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\AddCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\AddCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="AddDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="AddDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Revert"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\RevertCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\RevertCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\RevertDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\RevertDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Cleanup"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\CleanupCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\CleanupCommand.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Resolve"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\ResolveCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\ResolveCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\ResolveDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\ResolveDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Switch"\r
+               </Filter>\r
+               <Filter\r
+                       Name="Utility Dialogs"\r
+                       >\r
+               </Filter>\r
+               <File\r
+                       RelativePath="Resource.h"\r
+                       >\r
+               </File>\r
+               <File\r
+                       RelativePath="stdafx.cpp"\r
+                       >\r
+                       <FileConfiguration\r
+                               Name="Debug|Win32"\r

                                >\r
                                >\r

-                               <File\r
-                                       RelativePath=".\Commands\SwitchCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\SwitchCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="SwitchDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="SwitchDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Merge"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\MergeAllCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\MergeAllCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeAllDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeAllDlg.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\MergeCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\MergeCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizard.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizard.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizardBasePage.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizardOptions.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizardOptions.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizardReintegrate.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizardReintegrate.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizardRevRange.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizardRevRange.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizardStart.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizardStart.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizardTree.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeWizardTree.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Settings"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\SettingsCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\SettingsCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <Filter\r
-                                       Name="Settings Dialog"\r
-                                       >\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetBugTraq.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetBugTraq.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetBugTraqAdv.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetBugTraqAdv.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetDialogs.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetDialogs.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetHooks.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetHooks.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetHooksAdv.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetHooksAdv.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetLogCache.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetLogCache.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetLookAndFeelPage.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetLookAndFeelPage.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetMainPage.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetMainPage.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetMisc.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetMisc.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetOverlayIcons.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetOverlayIcons.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetOverlayPage.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetOverlayPage.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetProgsAdvDlg.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetProgsAdvDlg.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetProxyPage.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetProxyPage.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetSavedDataPage.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SetSavedDataPage.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\Settings.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\Settings.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsColors.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsColors.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsLogCaches.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsLogCaches.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsProgsDiff.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsProgsDiff.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsProgsMerge.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsProgsMerge.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsProgsUniDiff.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsProgsUniDiff.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsPropPage.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsPropPage.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsRevisionGraph.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsRevisionGraph.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsTBlame.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\SettingsTBlame.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\ToolAssocDlg.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\Settings\ToolAssocDlg.h"\r
-                                               >\r
-                                       </File>\r
-                               </Filter>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Remove"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\RemoveCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\RemoveCommand.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Rename"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\RenameCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\RenameCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="RenameDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="RenameDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Diff"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\DiffCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\DiffCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\PrevDiffCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\PrevDiffCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\ShowCompareCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\ShowCompareCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\UrlDiffCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\UrlDiffCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\UrlDiffDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\UrlDiffDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Drop"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\DropCopyAddCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\DropCopyAddCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\DropCopyCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\DropCopyCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\DropExportCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\DropExportCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\DropMoveCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\DropMoveCommand.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Relocate"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\RelocateCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\RelocateCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="RelocateDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="RelocateDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="RepoStatus"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\ChangedDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\ChangedDlg.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\RepoStatusCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\RepoStatusCommand.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="RepoBrowser"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\RepositoryBrowserCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\RepositoryBrowserCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <Filter\r
-                                       Name="Repository Browser"\r
-                                       >\r
-                                       <File\r
-                                               RelativePath=".\RepoDrags.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RepoDrags.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RepositoryBar.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RepositoryBar.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="RepositoryBrowser.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="RepositoryBrowser.h"\r
-                                               >\r
-                                       </File>\r
-                               </Filter>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="(Un)Ignore"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\IgnoreCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\IgnoreCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\UnIgnoreCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\UnIgnoreCommand.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Blame"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Blame.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Blame.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\BlameCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\BlameCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\BlameDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\BlameDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="CreatePatch"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\CreatePatchCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\CreatePatchCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\CreatePatchDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\CreatePatchDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="UpdateCheck"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\CheckForUpdatesDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\CheckForUpdatesDlg.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\UpdateCheckCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\UpdateCheckCommand.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="RevisionGraph"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\RevisionGraphCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\RevisionGraphCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\RevisionGraph\SimpleList.h"\r
-                                       >\r
-                               </File>\r
-                               <Filter\r
-                                       Name="Layout"\r
-                                       >\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\IRevisionGraphLayout.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\StandardLayout.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\StandardLayout.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\StandardLayoutConnectionList.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\StandardLayoutConnectionList.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\StandardLayoutNodeList.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\StandardLayoutNodeList.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\StandardLayoutTextList.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\StandardLayoutTextList.h"\r
-                                               >\r
-                                       </File>\r
-                               </Filter>\r
-                               <Filter\r
-                                       Name="FullGraph"\r
-                                       >\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\FullGraph.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\FullGraph.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\FullGraphBuilder.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\FullGraphBuilder.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\FullGraphFinalizer.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\FullGraphFinalizer.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\FullGraphNode.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\FullGraphNode.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\FullHistory.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\FullHistory.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\NodeClassification.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\PathClassificator.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\PathClassificator.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\SearchPathTree.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\SearchPathTree.h"\r
-                                               >\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCustomBuildTool"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Debug|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCustomBuildTool"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|Win32"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCustomBuildTool"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                               <FileConfiguration\r
-                                                       Name="Release|x64"\r
-                                                       >\r
-                                                       <Tool\r
-                                                               Name="VCCustomBuildTool"\r
-                                                       />\r
-                                               </FileConfiguration>\r
-                                       </File>\r
-                               </Filter>\r
-                               <Filter\r
-                                       Name="VisibleGraph"\r
-                                       >\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\VisibleGraph.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\VisibleGraph.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\VisibleGraphBuilder.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\VisibleGraphBuilder.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\VisibleGraphNode.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\VisibleGraphNode.h"\r
-                                               >\r
-                                       </File>\r
-                               </Filter>\r
-                               <Filter\r
-                                       Name="UI"\r
-                                       >\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\RevGraphFilterDlg.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\RevGraphFilterDlg.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\RevisionGraphDlg.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\RevisionGraphDlg.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\RevisionGraphDlgDraw.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\RevisionGraphDlgFunc.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\RevisionGraphWnd.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\RevisionGraphWnd.h"\r
-                                               >\r
-                                       </File>\r
-                               </Filter>\r
-                               <Filter\r
-                                       Name="Options"\r
-                                       >\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\AllGraphOptions.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\AllGraphOptions.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\CopyFilterOptions.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\CopyFilterOptions.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\LayoutOptions.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\LayoutOptions.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\ModificationOptions.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\ModificationOptions.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\RevisionGraphOptions.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\RevisionGraphOptions.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath=".\RevisionGraph\RevisionGraphOptionsImpl.h"\r
-                                               >\r
-                                       </File>\r
-                                       <Filter\r
-                                               Name="Layout"\r
-                                               >\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\StandardNodePositioning.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\StandardNodePositioning.h"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\StandardNodeSizeAssignment.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\StandardNodeSizeAssignment.h"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\StrictOrderNodePositioning.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\StrictOrderNodePositioning.h"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\UpsideDownLayout.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\UpsideDownLayout.h"\r
-                                                       >\r
-                                               </File>\r
-                                       </Filter>\r
-                                       <Filter\r
-                                               Name="Copy"\r
-                                               >\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\RemoveDeletedBranches.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\RemoveDeletedBranches.h"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\RemovePathsBySubString.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\RemovePathsBySubString.h"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\RemoveSimpleChanges.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\RemoveSimpleChanges.h"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\RevisionInRange.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\RevisionInRange.h"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\ShowHeads.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\ShowHeads.h"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\ShowWC.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\ShowWC.h"\r
-                                                       >\r
-                                               </File>\r
-                                       </Filter>\r
-                                       <Filter\r
-                                               Name="Modification"\r
-                                               >\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\ExactCopyFroms.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\ExactCopyFroms.h"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\FoldTags.cpp"\r
-                                                       >\r
-                                               </File>\r
-                                               <File\r
-                                                       RelativePath=".\RevisionGraph\FoldTags.h"\r
-                                                       >\r
-                                               </File>\r
-                                       </Filter>\r
-                               </Filter>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="(Un)Lock"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\LockCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\LockCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\LockDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\LockDlg.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\UnLockCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\UnLockCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\UnlockDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\UnlockDlg.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Properties"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\EditPropertiesDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\EditPropertiesDlg.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\EditPropertyValueDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\EditPropertyValueDlg.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\PropertiesCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\PropertiesCommand.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="DelUnversioned"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\DeleteUnversionedDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\DeleteUnversionedDlg.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\DelUnversionedCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\DelUnversionedCommand.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Paste"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\PasteCopyCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\PasteCopyCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\PasteMoveCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\PasteMoveCommand.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Utility Dialogs"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\ConflictResolveDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\ConflictResolveDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\CreateChangelistDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\CreateChangelistDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\FileDiffDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\FileDiffDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\GoOffline.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\GoOffline.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\HistoryDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\HistoryDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\InputDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\InputDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\InputLogDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\InputLogDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\LogCacheStatisticsDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\LogCacheStatisticsDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PromptDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PromptDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\PropDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\PropDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\RevisionDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\RevisionDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\RevisionRangeDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\RevisionRangeDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\SimplePrompt.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\SimplePrompt.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\StatGraphDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\StatGraphDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="SVNProgressDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="SVNProgressDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\URLDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\URLDlg.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <File\r
-                       RelativePath="Resource.h"\r
-                       >\r
-               </File>\r
-               <File\r
-                       RelativePath="stdafx.cpp"\r
-                       >\r
-                       <FileConfiguration\r
-                               Name="Debug|Win32"\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       UsePrecompiledHeader="1"\r
+                               />\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Release|Win32"\r

                                >\r
                                <Tool\r
                                        Name="VCCLCompilerTool"\r
                                >\r
                                <Tool\r
                                        Name="VCCLCompilerTool"\r


@@ -3534,14 +1018,6 @@
                                />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
                                />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r

-                               Name="Release|Win32"\r
-                               >\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       UsePrecompiledHeader="1"\r
-                               />\r
-                       </FileConfiguration>\r
-                       <FileConfiguration\r

                                Name="Release|x64"\r
                                >\r
                                <Tool\r
                                Name="Release|x64"\r
                                >\r
                                <Tool\r

diff --git a/TortoiseProc/stdafx.h b/TortoiseProc/stdafx.h
index 8fb573b..c85d72f 100644 (file)
--- a/TortoiseProc/stdafx.h
+++ b/TortoiseProc/stdafx.h
@@ -40,7 +40,7 @@
 #endif // _AFX_NO_AFXCMN_SUPPORT\r
 #include <afxdlgs.h>\r
 #include <afxctl.h>\r
 #endif // _AFX_NO_AFXCMN_SUPPORT\r
 #include <afxdlgs.h>\r
 #include <afxctl.h>\r

-#include <afxtempl.h>\r
+#include <afxtempl.h>a\r

 #include <afxmt.h>\r
 #include <afxext.h>         // MFC extensions\r
 #include <afxcontrolbars.h>     // MFC support for ribbons and control bars\r
 #include <afxmt.h>\r
 #include <afxext.h>         // MFC extensions\r
 #include <afxcontrolbars.h>     // MFC support for ribbons and control bars\r


@@ -51,19 +51,6 @@
 #define LVS_EX_DOUBLEBUFFER     0x00010000\r
 #endif\r
 \r
 #define LVS_EX_DOUBLEBUFFER     0x00010000\r
 #endif\r
 \r

-#pragma warning(push)\r
-#include "apr_general.h"\r
-#include "svn_pools.h"\r
-#include "svn_client.h"\r
-#include "svn_path.h"\r
-#include "svn_wc.h"\r
-#include "svn_utf.h"\r
-#include "svn_config.h"\r
-#include "svn_error_codes.h"\r
-#include "svn_subst.h"\r
-#include "svn_repos.h"\r
-#include "svn_time.h"\r
-#pragma warning(pop)\r

 \r
 #pragma warning(push)\r
 #pragma warning(disable: 4702) // Unreachable code warnings in xtree\r
 \r
 #pragma warning(push)\r
 #pragma warning(disable: 4702) // Unreachable code warnings in xtree\r


@@ -89,18 +76,9 @@
 #include <gdiplus.h>\r
 #pragma warning(pop)\r
 \r
 #include <gdiplus.h>\r
 #pragma warning(pop)\r
 \r

-#pragma warning(push)\r
-#pragma warning(disable: 4005) // macro redefinition\r
-#include "..\..\ext\apr\include\apr_version.h"\r
-#include "..\..\ext\apr-util\include\apu_version.h"\r
-//#include "..\..\ext\berkeley-db\db4.3-win32\include\db.h"\r
-#include "..\..\ext\neon\config.h"\r
-#include "..\..\..\common\openssl\inc32\openssl\opensslv.h"\r
-#include "..\..\..\common\zlib\zlib.h"\r
-#pragma warning(pop)\r

 \r
 #define __WIN32__\r
 \r
 #define __WIN32__\r

-#include "boost/pool/object_pool.hpp"\r
+\r

 \r
 #define USE_GDI_GRADIENT\r
 #define HISTORYCOMBO_WITH_SYSIMAGELIST\r
 \r
 #define USE_GDI_GRADIENT\r
 #define HISTORYCOMBO_WITH_SYSIMAGELIST\r

diff --git a/TortoiseShell/TortoiseShell.vcproj b/TortoiseShell/TortoiseShell.vcproj
index bd9b3a9..9600a82 100644 (file)
--- a/TortoiseShell/TortoiseShell.vcproj
+++ b/TortoiseShell/TortoiseShell.vcproj
@@ -52,7 +52,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="0"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="0"\r

-                               AdditionalIncludeDirectories=""../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;"..\..\ext\libintl\libintl3-win32\inc";..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories=""../Git";"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;"..\..\ext\libintl\libintl3-win32\inc";..\Utils\MiscUI"\r

                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SVN_DEBUG"\r
                                BasicRuntimeChecks="1"\r
                                RuntimeLibrary="3"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SVN_DEBUG"\r
                                BasicRuntimeChecks="1"\r
                                RuntimeLibrary="3"\r


@@ -453,11 +453,15 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath=".\GitAdminDir.cpp"\r
+                               RelativePath="..\Git\GitAdminDir.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath=".\GitStatus.cpp"\r
+                               RelativePath="..\Git\GitRev.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Git\GitStatus.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r


@@ -533,7 +537,7 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r

-                               RelativePath=".\TGitPath.cpp"\r
+                               RelativePath="..\Git\TGitPath.cpp"\r

                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r


@@ -550,14 +554,6 @@
                        Filter="h;hpp;hxx;hm;inl;inc"\r
                        >\r
                        <File\r
                        Filter="h;hpp;hxx;hm;inl;inc"\r
                        >\r
                        <File\r

-                               RelativePath=".\GitAdminDir.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\GitStatus.h"\r
-                               >\r
-                       </File>\r
-                       <File\r

                                RelativePath=".\Globals.h"\r
                                >\r
                        </File>\r
                                RelativePath=".\Globals.h"\r
                                >\r
                        </File>\r


@@ -618,10 +614,6 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

-                               RelativePath=".\TGitPath.h"\r
-                               >\r
-                       </File>\r
-                       <File\r

                                RelativePath="..\Utils\UnicodeUtils.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\Utils\UnicodeUtils.h"\r
                                >\r
                        </File>\r

diff --git a/Utils/MiscUI/MessageBox.cpp b/Utils/MiscUI/MessageBox.cpp
index c52949e..6a086cc 100644 (file)
--- a/Utils/MiscUI/MessageBox.cpp
+++ b/Utils/MiscUI/MessageBox.cpp
@@ -17,7 +17,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
 //\r
 #include "StdAfx.h"\r
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
 //\r
 #include "StdAfx.h"\r

-#include "resource.h"                  //if you defined some IDS_MSGBOX_xxxx this include is needed!\r
+//#include "resource.h"                        //if you defined some IDS_MSGBOX_xxxx this include is needed!\r

 #include "messagebox.h"\r
 #include ".\messagebox.h"\r
 \r
 #include "messagebox.h"\r
 #include ".\messagebox.h"\r
 \r

diff --git a/Utils/ReadMe.txt b/Utils/ReadMe.txt
new file mode 100644 (file)
index 0000000..42b51bf
--- /dev/null
+++ b/Utils/ReadMe.txt
@@ -0,0 +1,39 @@
+========================================================================\r
+    STATIC LIBRARY : Utils Project Overview\r
+========================================================================\r
+\r
+AppWizard has created this Utils library project for you.\r
+\r
+This file contains a summary of what you will find in each of the files that\r
+make up your Utils application.\r
+\r
+\r
+Utils.vcproj\r
+    This is the main project file for VC++ projects generated using an Application Wizard.\r
+    It contains information about the version of Visual C++ that generated the file, and\r
+    information about the platforms, configurations, and project features selected with the\r
+    Application Wizard.\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+StdAfx.h, StdAfx.cpp\r
+    These files are used to build a precompiled header (PCH) file\r
+    named Utils.pch and a precompiled types file named StdAfx.obj.\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+The compiler and linker switches have been modified to support MFC. Using the\r
+MFC ClassWizard with this project requires that you add several files to the\r
+project, including "resource.h", "Utils.rc" and a "Utils.h" that\r
+includes resource.h. If you add an rc file to a static library, you may\r
+experience difficulties due to the limitation that only one rc file may be\r
+present in a Dll or Exe. This problem may be overcome by including the\r
+library's .rc file into the parent project's .rc file.\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+Other notes:\r
+\r
+AppWizard uses "TODO:" comments to indicate parts of the source code you\r
+should add to or customize.\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r

diff --git a/Utils/Utils.vcproj b/Utils/Utils.vcproj
index 2479407..fcc3ded 100644 (file)
--- a/Utils/Utils.vcproj
+++ b/Utils/Utils.vcproj
@@ -22,6 +22,7 @@
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r

+                       UseOfATL="1"\r

                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r


@@ -168,6 +169,10 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

+                               RelativePath=".\PathUtils.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r

                                RelativePath=".\PathWatcher.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\PathWatcher.cpp"\r
                                >\r
                        </File>\r


@@ -308,6 +313,10 @@
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r

+                               RelativePath=".\MiscUI\MessageBox.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r

                                RelativePath=".\MiscUI\MyGraph.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\MiscUI\MyGraph.cpp"\r
                                >\r
                        </File>\r

diff --git a/ext/ResizableLib/Artistic-License.txt b/ext/ResizableLib/Artistic-License.txt
new file mode 100644 (file)
index 0000000..803d229
--- /dev/null
+++ b/ext/ResizableLib/Artistic-License.txt
@@ -0,0 +1,99 @@
+The Artistic License\r
+\r
+Preamble\r
+\r
+The intent of this document is to state the conditions under which a Package \r
+may be copied, such that the Copyright Holder maintains some semblance of \r
+artistic control over the development of the package, while giving the users of \r
+the package the right to use and distribute the Package in a more-or-less \r
+customary fashion, plus the right to make reasonable modifications.\r
+\r
+Definitions:\r
+\r
+  * "Package" refers to the collection of files distributed by the Copyright \r
+    Holder, and derivatives of that collection of files created through textual \r
+    modification. \r
+  * "Standard Version" refers to such a Package if it has not been modified, \r
+    or has been modified in accordance with the wishes of the Copyright Holder. \r
+  * "Copyright Holder" is whoever is named in the copyright or copyrights for \r
+    the package. \r
+  * "You" is you, if you're thinking about copying or distributing this \r
+    Package. \r
+  * "Reasonable copying fee" is whatever you can justify on the basis of media \r
+    cost, duplication charges, time of people involved, and so on. (You will not \r
+    be required to justify it to the Copyright Holder, but only to the computing \r
+    community at large as a market that must bear the fee.) \r
+  * "Freely Available" means that no fee is charged for the item itself, \r
+    though there may be fees involved in handling the item. It also means that \r
+    recipients of the item may redistribute it under the same conditions they \r
+    received it.\r
+\r
+1. You may make and give away verbatim copies of the source form of the \r
+   Standard Version of this Package without restriction, provided that you \r
+   duplicate all of the original copyright notices and associated disclaimers.\r
+\r
+2. You may apply bug fixes, portability fixes and other modifications derived \r
+   from the Public Domain or from the Copyright Holder. A Package modified in such \r
+   a way shall still be considered the Standard Version.\r
+\r
+3. You may otherwise modify your copy of this Package in any way, provided \r
+   that you insert a prominent notice in each changed file stating how and when you \r
+   changed that file, and provided that you do at least ONE of the following:\r
+\r
+  a) place your modifications in the Public Domain or otherwise make them \r
+     Freely Available, such as by posting said modifications to Usenet or an \r
+     equivalent medium, or placing the modifications on a major archive site such \r
+     as ftp.uu.net, or by allowing the Copyright Holder to include your \r
+     modifications in the Standard Version of the Package.\r
+  \r
+  b) use the modified Package only within your corporation or \r
+     organization.\r
+  \r
+  c) rename any non-standard executables so the names do not conflict with \r
+     standard executables, which must also be provided, and provide a separate \r
+     manual page for each non-standard executable that clearly documents how it \r
+     differs from the Standard Version.\r
+\r
+  d) make other distribution arrangements with the Copyright Holder.\r
+\r
+4. You may distribute the programs of this Package in object code or \r
+   executable form, provided that you do at least ONE of the following:\r
+\r
+  a) distribute a Standard Version of the executables and library files, \r
+     together with instructions (in the manual page or equivalent) on where to get \r
+     the Standard Version.\r
+  \r
+  b) accompany the distribution with the machine-readable source of the \r
+     Package with your modifications.\r
+  \r
+  c) accompany any non-standard executables with their corresponding Standard \r
+     Version executables, giving the non-standard executables non-standard names, \r
+     and clearly documenting the differences in manual pages (or equivalent), \r
+     together with instructions on where to get the Standard Version.\r
+  \r
+  d) make other distribution arrangements with the Copyright Holder.\r
+  \r
+5. You may charge a reasonable copying fee for any distribution of this \r
+   Package. You may charge any fee you choose for support of this Package. You may \r
+   not charge a fee for this Package itself. However, you may distribute this \r
+   Package in aggregate with other (possibly commercial) programs as part of a \r
+   larger (possibly commercial) software distribution provided that you do not \r
+   advertise this Package as a product of your own.\r
+\r
+6. The scripts and library files supplied as input to or produced as output \r
+   from the programs of this Package do not automatically fall under the copyright \r
+   of this Package, but belong to whomever generated them, and may be sold \r
+   commercially, and may be aggregated with this Package.\r
+\r
+7. C or perl subroutines supplied by you and linked into this Package shall \r
+   not be considered part of this Package.\r
+\r
+8. The name of the Copyright Holder may not be used to endorse or promote \r
+   products derived from this software without specific prior written \r
+   permission.\r
+\r
+9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED \r
+   WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF \r
+   MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.\r
+\r
+The End\r

diff --git a/ext/ResizableLib/ChangeLog b/ext/ResizableLib/ChangeLog
new file mode 100644 (file)
index 0000000..18fe105
--- /dev/null
+++ b/ext/ResizableLib/ChangeLog
@@ -0,0 +1,475 @@
+2002-10-16  ppescher\r
+       * ResizableLayout.cpp 1.26:\r
+               fixed BS_TYPEMASK collision with Platform SDK\r
+\r
+       * ResizableFormView.cpp 1.14:\r
+               adjusted a commented code part\r
+\r
+       * ResizableDialog.cpp 1.18:\r
+               fixed border/grip issue with child dialogs\r
+\r
+2002-10-13  ppescher\r
+       * ResizableLib.dsp 1.10:\r
+               initial support for custom windows\r
+\r
+       * ResizableSheet.cpp 1.22:\r
+       * ResizableSheetEx.cpp 1.19:\r
+               updated callback item, now using GetAnchorPosition\r
+\r
+       * ResizableLayout.cpp 1.25:\r
+       * ResizableLayout.h 1.15:\r
+               added initial support for custom windows\r
+               unified repositioning of all windows (callback and non), now made all at once\r
+\r
+2002-10-12  ppescher\r
+       * ResizableMsgSupport.h 1.1:\r
+       * ResizableMsgSupport.inl 1.1:\r
+               initial support for custom windows\r
+\r
+2002-10-07  ppescher\r
+       * ResizableLayout.cpp 1.24:\r
+               fixed groupbox\r
+               (adding WS_CLIPSIBLINGS leads to uncorrect results when overlapping other controls)\r
+\r
+2002-10-06  ppescher\r
+       * ResizableFrame.cpp 1.2:\r
+       * ResizableFrame.h 1.2:\r
+       * ResizableMDIChild.cpp 1.2:\r
+       * ResizableMDIChild.h 1.2:\r
+       * ResizableMDIFrame.cpp 1.2:\r
+       * ResizableMDIFrame.h 1.2:\r
+               added support for state saving/restoring\r
+               min track size not fully working with splitters\r
+\r
+       * ResizableDialog.cpp 1.17:\r
+       * ResizableSheet.cpp 1.21:\r
+       * ResizableSheetEx.cpp 1.18:\r
+               updated grip creation\r
+\r
+       * ResizableGrip.cpp 1.11:\r
+       * ResizableGrip.h 1.12:\r
+               added shape customization\r
+               added listening for system parameters changes (to update grip size)\r
+\r
+       * ResizableFormView.cpp 1.13:\r
+       * ResizableFormView.h 1.8:\r
+               added OnDestroy handler\r
+               updated grip creation\r
+\r
+2002-09-28  ppescher\r
+       * ResizableFormView.cpp 1.12:\r
+       * ResizableFormView.h 1.7:\r
+               changed grip handling\r
+               finished support for minmax handling\r
+\r
+       * ResizableGrip.cpp 1.10:\r
+       * ResizableGrip.h 1.11:\r
+               changed hide/show functions\r
+\r
+       * ResizableDialog.cpp 1.16:\r
+       * ResizableDialog.h 1.10:\r
+       * ResizableSheet.cpp 1.20:\r
+       * ResizableSheet.h 1.12:\r
+       * ResizableSheetEx.cpp 1.17:\r
+       * ResizableSheetEx.h 1.9:\r
+               updated grip handling when maximized according to latest grip implementation\r
+\r
+       * ResizableLib.dsp 1.9:\r
+               added new classes\r
+\r
+       * ResizableFrame.cpp 1.1:\r
+       * ResizableFrame.h 1.1:\r
+       * ResizableMDIChild.cpp 1.1:\r
+       * ResizableMDIChild.h 1.1:\r
+       * ResizableMDIFrame.cpp 1.1:\r
+       * ResizableMDIFrame.h 1.1:\r
+               added minmax implementation for Frame windows\r
+\r
+2002-09-23  ppescher\r
+       * ResizableGrip.cpp 1.9:\r
+       * ResizableGrip.h 1.10:\r
+               added transparency support\r
+\r
+       * ResizableLayout.cpp 1.23:\r
+               fix for ownerdraw buttons\r
+               fixed duplicate additions to the layout (now ASSERTs)\r
+\r
+       * ResizableFormView.cpp 1.11:\r
+       * ResizableFormView.h 1.6:\r
+               fixed the grip\r
+\r
+2002-09-21  ppescher\r
+       * ResizableLayout.cpp 1.22:\r
+               complete fix for scrolled parent\r
+\r
+       * ResizableGrip.cpp 1.8:\r
+       * ResizableGrip.h 1.9:\r
+               enhanced grip: added support for temporarily hide/show the grip\r
+\r
+       * ResizableFormView.cpp 1.10:\r
+       * ResizableFormView.h 1.5:\r
+               added grip support\r
+\r
+       * ResizableDialog.cpp 1.15:\r
+       * ResizableSheet.cpp 1.19:\r
+       * ResizableSheetEx.cpp 1.16:\r
+               updated for the enhanced grip\r
+\r
+2002-09-19  ppescher\r
+       * ResizableFormView.cpp 1.9:\r
+       * ResizableLayout.cpp 1.21:\r
+               fixed FormView scroll problem\r
+\r
+2002-09-14  ppescher\r
+       * ResizableLayout.cpp 1.20:\r
+               cleaned up the code\r
+               updated copyright\r
+\r
+2002-08-23  ppescher\r
+       * ResizableDialog.cpp 1.14:\r
+       * ResizableDialog.h 1.9:\r
+       * ResizableFormView.cpp 1.8:\r
+       * ResizableFormView.h 1.4:\r
+       * ResizableGrip.cpp 1.7:\r
+       * ResizableGrip.h 1.8:\r
+       * ResizableLayout.cpp 1.19:\r
+       * ResizableLayout.h 1.14:\r
+       * ResizableMinMax.cpp 1.3:\r
+       * ResizableMinMax.h 1.3:\r
+       * ResizablePage.cpp 1.8:\r
+       * ResizablePage.h 1.7:\r
+       * ResizablePageEx.cpp 1.10:\r
+       * ResizablePageEx.h 1.7:\r
+       * ResizableSheet.cpp 1.18:\r
+       * ResizableSheet.h 1.11:\r
+       * ResizableSheetEx.cpp 1.15:\r
+       * ResizableSheetEx.h 1.8:\r
+       * ResizableState.cpp 1.5:\r
+       * ResizableState.h 1.5:\r
+               fixed copyright msg\r
+\r
+2002-07-11  ppescher\r
+       * ResizablePageEx.cpp 1.9:\r
+       * ResizablePageEx.h 1.6:\r
+               changes for new NeedsRefresh function\r
+\r
+       * ResizableLayout.cpp 1.18:\r
+       * ResizableLayout.h 1.13:\r
+               many improvements for anti-flickering\r
+               changes in internal layout implementation\r
+               changes in clipping and refresh functions\r
+\r
+2002-07-01  ppescher\r
+       * ResizableDialog.cpp 1.13:\r
+       * ResizableDialog.h 1.8:\r
+       * ResizablePage.cpp 1.7:\r
+       * ResizablePage.h 1.6:\r
+       * ResizablePageEx.cpp 1.8:\r
+       * ResizablePageEx.h 1.5:\r
+       * ResizableSheet.cpp 1.17:\r
+       * ResizableSheet.h 1.10:\r
+       * ResizableSheetEx.cpp 1.14:\r
+       * ResizableSheetEx.h 1.7:\r
+               cleaned up the code\r
+               removed m_bInitDone (not needed)\r
+\r
+       * ResizableGrip.cpp 1.6:\r
+       * ResizableGrip.h 1.7:\r
+               changed grip implementation (using MFC derived class)\r
+\r
+2002-06-27  ppescher\r
+       * ResizableLayout.cpp 1.17:\r
+       * ResizableLayout.h 1.12:\r
+               added remove anchor and get layout info functions\r
+               changed layout implementation\r
+\r
+2002-05-26  ppescher\r
+       * ResizableLayout.cpp 1.16:\r
+               fix for  type of static control\r
+\r
+2002-05-16  ppescher\r
+       * ResizableSheet.cpp 1.16:\r
+       * ResizableSheet.h 1.9:\r
+       * ResizableSheetEx.cpp 1.13:\r
+       * ResizableSheetEx.h 1.6:\r
+               added refresh function for dynamic page changes\r
+\r
+2002-05-15  ppescher\r
+       * ResizableSheet.cpp 1.15:\r
+       * ResizableSheetEx.cpp 1.12:\r
+               partial fix for dynamic page changes (Add/RemovePage)\r
+\r
+2002-03-27  ppescher\r
+       * ResizableLayout.cpp 1.15:\r
+       * ResizableLib.dsp 1.8:\r
+               fix callbacks and project precompiled headers\r
+\r
+2002-03-12  ppescher\r
+       * ResizableLayout.h 1.11:\r
+       * ResizableLib.dsp 1.7:\r
+       * ResizablePageEx.cpp 1.7:\r
+       * ResizableSheetEx.cpp 1.11:\r
+       * StdAfx.h 1.4:\r
+               fix for VS.NET and commctls\r
+\r
+2002-02-27  ppescher\r
+       * ResizableComboBox.cpp [RCombo_NewList] 1.4.2.1:\r
+       * ResizableComboBox.h [RCombo_NewList] 1.4.2.1:\r
+       * ResizableComboLBox.cpp [RCombo_NewList] 1.6.2.1:\r
+       * ResizableComboLBox.h [RCombo_NewList] 1.6.2.1:\r
+               first attempt at a new list class\r
+\r
+2002-02-26  ppescher\r
+       * ResizableComboBox.cpp 1.4:\r
+       * ResizableComboBox.h 1.4:\r
+       * ResizableComboLBox.cpp 1.6:\r
+       * ResizableComboLBox.h 1.6:\r
+               moved some functions, fixed vscroll\r
+\r
+2002-02-25  ppescher\r
+       * ResizableComboBox.cpp 1.3:\r
+       * ResizableComboBox.h 1.3:\r
+       * ResizableComboLBox.cpp 1.5:\r
+       * ResizableComboLBox.h 1.5:\r
+               moved hscroll functions\r
+\r
+2002-02-24  ppescher\r
+       * ResizableComboLBox.cpp 1.4:\r
+       * ResizableComboLBox.h 1.4:\r
+       * ResizableGrip.cpp 1.5:\r
+       * ResizableGrip.h 1.6:\r
+       * ResizableLayout.cpp 1.14:\r
+       * StdAfx.h 1.3:\r
+               fixed RTL defines and functions and include files\r
+\r
+2002-02-23  ppescher\r
+       * ResizableDialog.cpp 1.12:\r
+       * ResizableFormView.cpp 1.7:\r
+       * ResizableLayout.cpp 1.13:\r
+       * ResizableLayout.h 1.10:\r
+       * ResizablePage.cpp 1.6:\r
+       * ResizablePageEx.cpp 1.6:\r
+       * ResizableSheet.cpp 1.14:\r
+       * ResizableSheetEx.cpp 1.10:\r
+               fixed background painting for RTL layouts\r
+\r
+       * ResizableComboBox.cpp 1.2:\r
+       * ResizableComboBox.h 1.2:\r
+       * ResizableComboLBox.cpp 1.3:\r
+       * ResizableComboLBox.h 1.3:\r
+               added support for auto-hscroll\r
+\r
+2002-02-22  ppescher\r
+       * StdAfx.h 1.2:\r
+               fix WINVER with latest SDK, for Wizard97 to work properly\r
+\r
+       * ResizableDialog.cpp 1.11:\r
+       * ResizableFormView.cpp 1.6:\r
+       * ResizablePage.cpp 1.5:\r
+       * ResizablePageEx.cpp 1.5:\r
+       * ResizableSheet.cpp 1.13:\r
+       * ResizableSheetEx.cpp 1.9:\r
+               fix for WinXP clipping region\r
+\r
+2002-02-21  ppescher\r
+       * ResizableDialog.cpp 1.10:\r
+       * ResizableDialog.h 1.7:\r
+       * ResizableFormView.cpp 1.5:\r
+       * ResizableFormView.h 1.3:\r
+       * ResizablePage.cpp 1.4:\r
+       * ResizablePage.h 1.5:\r
+       * ResizablePageEx.cpp 1.4:\r
+       * ResizablePageEx.h 1.4:\r
+       * ResizableSheet.cpp 1.12:\r
+       * ResizableSheet.h 1.8:\r
+       * ResizableSheetEx.cpp 1.8:\r
+       * ResizableSheetEx.h 1.5:\r
+               changed common constructor name\r
+\r
+2002-02-19  ppescher\r
+       * ResizableComboLBox.cpp 1.2:\r
+       * ResizableComboLBox.h 1.2:\r
+               second attempt (slightly better)\r
+\r
+2002-02-18  ppescher\r
+       * ResizableGrip.h 1.5:\r
+               fixed a define for compatibility with latest SDK\r
+\r
+       * ResizableComboBox.cpp 1.1:\r
+       * ResizableComboBox.h 1.1:\r
+       * ResizableComboLBox.cpp 1.1:\r
+       * ResizableComboLBox.h 1.1:\r
+       * ResizableLib.dsp 1.6:\r
+               added resizable combobox classes\r
+\r
+2002-02-09  ppescher\r
+       * ResizableDialog.cpp 1.9:\r
+               possible fix for WinXP clipping region (commented)\r
+\r
+       * ResizableLayout.cpp 1.12:\r
+       * ResizableLayout.h 1.9:\r
+               changed clipping method, working on a stand-alone region\r
+\r
+2002-02-04  ppescher\r
+       * ResizableLayout.cpp 1.11:\r
+       * ResizableSheet.cpp 1.11:\r
+       * ResizableSheetEx.cpp 1.7:\r
+               fix for RTL layouts\r
+               fix for maximum size clipping problem\r
+\r
+2001-10-06  ppescher\r
+       * ResizableFormView.cpp 1.4:\r
+               re-ordered GetTotalClientRect() code\r
+\r
+2001-10-05  ppescher\r
+       * ResizableLayout.cpp 1.10:\r
+       * ResizableLayout.h 1.8:\r
+               cosmetic stuff (variable names)\r
+\r
+       * ResizableSheet.cpp 1.10:\r
+       * ResizableSheet.h 1.7:\r
+       * ResizableSheetEx.cpp 1.6:\r
+       * ResizableSheetEx.h 1.4:\r
+               fix for [CTRL+Tab] when switching pages\r
+\r
+2001-08-22  ppescher\r
+       * ResizableDialog.cpp 1.8:\r
+       * ResizableSheet.cpp 1.9:\r
+       * ResizableSheetEx.cpp 1.5:\r
+               fixed initialization for windows with menu bar\r
+\r
+2001-08-17  ppescher\r
+       * .cvsignore 1.2:\r
+               added static build configurations\r
+\r
+2001-08-16  ppescher\r
+       * ResizableLib.dsp 1.5:\r
+               added static build configurations\r
+\r
+2001-08-10  ppescher\r
+       * ResizableDialog.cpp 1.7:\r
+       * ResizableSheet.cpp 1.8:\r
+       * ResizableSheetEx.cpp 1.4:\r
+               fixed sizing border bug (client area preserved now)\r
+\r
+2001-08-05  Administrator\r
+       * Docs/DoDoxygen.bat 1.1:\r
+       * Docs/doxyfile.txt 1.1:\r
+       * ResizableDialog.cpp 1.6:\r
+       * ResizableDialog.h 1.6:\r
+       * ResizableFormView.cpp 1.3:\r
+       * ResizableFormView.h 1.2:\r
+       * ResizableGrip.cpp 1.4:\r
+       * ResizableGrip.h 1.4:\r
+       * ResizableLayout.cpp 1.9:\r
+       * ResizableLayout.h 1.7:\r
+       * ResizableLib.dsp 1.4:\r
+       * ResizableMinMax.cpp 1.2:\r
+       * ResizableMinMax.h 1.2:\r
+       * ResizablePage.cpp 1.3:\r
+       * ResizablePage.h 1.4:\r
+       * ResizablePageEx.cpp 1.3:\r
+       * ResizablePageEx.h 1.3:\r
+       * ResizableSheet.cpp 1.7:\r
+       * ResizableSheet.h 1.6:\r
+       * ResizableSheetEx.cpp 1.3:\r
+       * ResizableSheetEx.h 1.3:\r
+       * ResizableState.cpp 1.4:\r
+       * ResizableState.h 1.4:\r
+               added doc\r
+\r
+       * Artistic-License.txt 1.1:\r
+               changed license to AL\r
+\r
+       * ResizableFormView.cpp 1.2:\r
+               now uses documented function to calc total client area\r
+               fix for non-scrollable forms\r
+\r
+2001-08-01  Administrator\r
+       * ResizableLayout.cpp 1.8:\r
+               fixed transparent toolbars\r
+\r
+2001-07-21  Administrator\r
+       * ResizableLayout.cpp 1.7:\r
+       * ResizableLayout.h 1.6:\r
+               fixed problems with clipping overlapped controls\r
+               now you must add anchors in order of inclusion\r
+               fixed problem with transparent toolbars (I was clipping device units)\r
+\r
+2001-07-06  paolo\r
+       * ResizableDialog.cpp 1.5:\r
+       * ResizableDialog.h 1.5:\r
+       * ResizableGrip.cpp 1.3:\r
+       * ResizableGrip.h 1.3:\r
+       * ResizableLayout.cpp 1.6:\r
+       * ResizableLayout.h 1.5:\r
+       * ResizableLib.dsp 1.3:\r
+       * ResizablePageEx.cpp 1.2:\r
+       * ResizablePageEx.h 1.2:\r
+       * ResizableSheet.cpp 1.6:\r
+       * ResizableSheet.h 1.5:\r
+       * ResizableSheetEx.cpp 1.2:\r
+       * ResizableSheetEx.h 1.2:\r
+               global updates\r
+\r
+2001-06-18  paolo\r
+       * ResizableFormView.cpp 1.1:\r
+       * ResizableFormView.h 1.1:\r
+       * ResizableLayout.cpp 1.5:\r
+       * ResizableLayout.h 1.4:\r
+       * ResizableLib.dsp 1.2:\r
+       * ResizablePageEx.cpp 1.1:\r
+       * ResizablePageEx.h 1.1:\r
+       * ResizableSheet.cpp 1.5:\r
+       * ResizableSheet.h 1.4:\r
+       * ResizableSheetEx.cpp 1.1:\r
+       * ResizableSheetEx.h 1.1:\r
+               added wizard97 dialogs\r
+               added formviews\r
+               integration of property sheets\r
+\r
+2001-06-08  paolo\r
+       * ResizableDialog.cpp 1.4:\r
+       * ResizableDialog.h 1.4:\r
+       * ResizableLayout.cpp 1.3:\r
+       * ResizableLayout.h 1.3:\r
+       * ResizablePage.cpp 1.2:\r
+       * ResizablePage.h 1.3:\r
+               anti-flickering added\r
+\r
+       * ResizableLayout.cpp 1.4:\r
+       * ResizableSheet.cpp 1.4:\r
+               corrections to DeferWindowPos (returned value incorrectly\r
+               discarded)\r
+\r
+2001-05-23  paolo\r
+       * ResizableDialog.cpp 1.3:\r
+       * ResizableDialog.h 1.3:\r
+       * ResizableSheet.cpp 1.3:\r
+       * ResizableSheet.h 1.3:\r
+       * ResizableState.cpp 1.3:\r
+       * ResizableState.h 1.3:\r
+               new save/restore version - if bRectOnly, uses screen coords\r
+\r
+       * ResizableDialog.cpp 1.2:\r
+       * ResizableDialog.h 1.2:\r
+       * ResizableGrip.cpp 1.2:\r
+       * ResizableGrip.h 1.2:\r
+       * ResizableLayout.cpp 1.2:\r
+       * ResizableLayout.h 1.2:\r
+       * ResizablePage.h 1.2:\r
+       * ResizableSheet.cpp 1.2:\r
+       * ResizableSheet.h 1.2:\r
+       * ResizableState.cpp 1.2:\r
+       * ResizableState.h 1.2:\r
+               changed save/restore allowing to be performed on window rect only\r
+               changed GetLayoutParent to GetResizableWnd\r
+               added GetResizableWnd to CResizableState\r
+\r
+2001-05-18  paolo\r
+       * ResizableLib.dsp 1.1:\r
+       * ResizableLib.dsw 1.1:\r
+       * StdAfx.cpp 1.1:\r
+       * StdAfx.h 1.1:\r
+               new ResizableLib with project settings working\r
+\r