Fix Compiler Error

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 187b5e9..20305be 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln
index dcacb33..e350f7b 100644 (file)
--- a/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@ -34,12 +34,7 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixSetup", "TortoiseGitSetu
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TSVNCache", "TGitCache\TSVNCache.vcproj", "{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wrap", "Wrap\Wrap.vcproj", "{F5ACFF87-241F-4F93-BD5B-444B47A20ED7}"\r
-EndProject\r
 Global\r
-       GlobalSection(TestCaseManagementSettings) = postSolution\r
-               CategoryFile = TortoiseGit.vsmdi\r
-       EndGlobalSection\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                debug_static|Mixed Platforms = debug_static|Mixed Platforms\r
                debug_static|Win32 = debug_static|Win32\r
@@ -255,26 +250,6 @@ Global
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.ActiveCfg = Release|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.Build.0 = Release|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x86.ActiveCfg = Release|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.debug_static|Win32.ActiveCfg = Debug|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.debug_static|Win32.Build.0 = Debug|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.debug_static|x86.ActiveCfg = Debug|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Debug|Win32.Build.0 = Debug|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.release_static|Win32.ActiveCfg = Release|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.release_static|Win32.Build.0 = Release|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.release_static|x86.ActiveCfg = Release|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Release|Mixed Platforms.Build.0 = Release|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Release|Win32.ActiveCfg = Release|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Release|Win32.Build.0 = Release|Win32\r
-               {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Release|x86.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/src/TortoiseProc/CreateBranchTagDlg.cpp b/src/TortoiseProc/CreateBranchTagDlg.cpp
new file mode 100644 (file)
index 0000000..082a52b
--- /dev/null
+++ b/src/TortoiseProc/CreateBranchTagDlg.cpp
@@ -0,0 +1,59 @@
+// CreateBranchTagDlg.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "CreateBranchTagDlg.h"\r
+\r
+\r
+// CCreateBranchTagDlg dialog\r
+\r
+IMPLEMENT_DYNAMIC(CCreateBranchTagDlg, CResizableStandAloneDialog)\r
+\r
+CCreateBranchTagDlg::CCreateBranchTagDlg(CWnd* pParent /*=NULL*/)\r
+       : CResizableStandAloneDialog(CCreateBranchTagDlg::IDD, pParent)\r
+{\r
+\r
+}\r
+\r
+CCreateBranchTagDlg::~CCreateBranchTagDlg()\r
+{\r
+}\r
+\r
+void CCreateBranchTagDlg::DoDataExchange(CDataExchange* pDX)\r
+{\r
+       CDialog::DoDataExchange(pDX);\r
+       DDX_Control(pDX, IDC_COMBOBOXEX_BRANCH, this->m_Branch);\r
+       DDX_Control(pDX, IDC_COMBOBOXEX_TAGS, this->m_Tags);\r
+       DDX_Control(pDX, IDC_COMBOBOXEX_VERSION, this->m_Version);\r
+                               \r
+       DDX_Text(pDX, IDC_BRANCH_TAG, this->m_BranchTagName);\r
+       DDX_Check(pDX,IDC_CHECK_FORCE,this->m_bForce);\r
+       DDX_Check(pDX,IDC_CHECK_TRACK,this->m_bTrack);\r
+\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CCreateBranchTagDlg, CResizableStandAloneDialog)\r
+END_MESSAGE_MAP()\r
+\r
+BOOL CCreateBranchTagDlg::OnInitDialog()\r
+{\r
+       CResizableStandAloneDialog::OnInitDialog();\r
+\r
+       AddAnchor(IDC_COMBOBOXEX_BRANCH, TOP_LEFT, TOP_RIGHT);\r
+       AddAnchor(IDC_COMBOBOXEX_TAGS, TOP_LEFT, TOP_RIGHT);\r
+       AddAnchor(IDC_COMBOBOXEX_VERSION, TOP_LEFT, TOP_RIGHT);\r
+\r
+       AddAnchor(IDC_GROUP_BRANCH, TOP_LEFT, TOP_RIGHT);\r
+       AddAnchor(IDC_GROUP_BASEON, TOP_LEFT, TOP_RIGHT);\r
+       AddAnchor(IDC_GROUP_OPTION, TOP_LEFT, TOP_RIGHT);\r
+\r
+       AddAnchor(IDOK,BOTTOM_RIGHT);\r
+       AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+\r
+       return TRUE;\r
+\r
+\r
+}\r
+// CCreateBranchTagDlg message handlers\r

diff --git a/src/TortoiseProc/CreateBranchTagDlg.h b/src/TortoiseProc/CreateBranchTagDlg.h
new file mode 100644 (file)
index 0000000..206dba2
--- /dev/null
+++ b/src/TortoiseProc/CreateBranchTagDlg.h
@@ -0,0 +1,34 @@
+#pragma once\r
+\r
+#include "StandAloneDlg.h"\r
+#include "HistoryCombo.h"\r
+\r
+// CCreateBranchTagDlg dialog\r
+\r
+class CCreateBranchTagDlg : public CResizableStandAloneDialog\r
+{\r
+       DECLARE_DYNAMIC(CCreateBranchTagDlg)\r
+\r
+public:\r
+       CCreateBranchTagDlg(CWnd* pParent = NULL);   // standard constructor\r
+       virtual ~CCreateBranchTagDlg();\r
+\r
+// Dialog Data\r
+       enum { IDD = IDD_NEW_BRANCH_TAG };\r
+\r
+       BOOL m_bForce;\r
+       BOOL m_bTrack;\r
+       BOOL m_bIsTag;\r
+\r
+       CString m_Base;\r
+       CString m_BranchTagName;\r
+protected:\r
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
+       virtual BOOL OnInitDialog();\r
+       \r
+       CHistoryCombo m_Branch;\r
+       CHistoryCombo m_Tags;\r
+       CHistoryCombo m_Version;\r
+       \r
+       DECLARE_MESSAGE_MAP()\r
+};\r

diff --git a/src/TortoiseProc/GitSwitch.cpp b/src/TortoiseProc/GitSwitch.cpp
new file mode 100644 (file)
index 0000000..f45cdf8
--- /dev/null
+++ b/src/TortoiseProc/GitSwitch.cpp
@@ -0,0 +1,33 @@
+// GitSwitch.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "GitSwitch.h"\r
+\r
+\r
+// CGitSwitch dialog\r
+\r
+IMPLEMENT_DYNAMIC(CGitSwitch, CDialog)\r
+\r
+CGitSwitch::CGitSwitch(CWnd* pParent /*=NULL*/)\r
+       : CDialog(CGitSwitch::IDD, pParent)\r
+{\r
+\r
+}\r
+\r
+CGitSwitch::~CGitSwitch()\r
+{\r
+}\r
+\r
+void CGitSwitch::DoDataExchange(CDataExchange* pDX)\r
+{\r
+       CDialog::DoDataExchange(pDX);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CGitSwitch, CDialog)\r
+END_MESSAGE_MAP()\r
+\r
+\r
+// CGitSwitch message handlers\r

diff --git a/src/TortoiseProc/GitSwitch.h b/src/TortoiseProc/GitSwitch.h
new file mode 100644 (file)
index 0000000..0d1499c
--- /dev/null
+++ b/src/TortoiseProc/GitSwitch.h
@@ -0,0 +1,21 @@
+#pragma once\r
+\r
+\r
+// CGitSwitch dialog\r
+\r
+class CGitSwitch : public CDialog\r
+{\r
+       DECLARE_DYNAMIC(CGitSwitch)\r
+\r
+public:\r
+       CGitSwitch(CWnd* pParent = NULL);   // standard constructor\r
+       virtual ~CGitSwitch();\r
+\r
+// Dialog Data\r
+       enum { IDD = IDD_GITSWITCH };\r
+\r
+protected:\r
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
+\r
+       DECLARE_MESSAGE_MAP()\r
+};\r

diff --git a/src/TortoiseProc/SwitchLocalBranchPage.cpp b/src/TortoiseProc/SwitchLocalBranchPage.cpp
new file mode 100644 (file)
index 0000000..f1cf989
--- /dev/null
+++ b/src/TortoiseProc/SwitchLocalBranchPage.cpp
@@ -0,0 +1,33 @@
+// SwitchLocalBranchPage.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "SwitchLocalBranchPage.h"\r
+\r
+\r
+// SwitchLocalBranchPage dialog\r
+\r
+IMPLEMENT_DYNAMIC(SwitchLocalBranchPage, CPropertyPage)\r
+\r
+SwitchLocalBranchPage::SwitchLocalBranchPage()\r
+       : CPropertyPage(SwitchLocalBranchPage::IDD)\r
+{\r
+\r
+}\r
+\r
+SwitchLocalBranchPage::~SwitchLocalBranchPage()\r
+{\r
+}\r
+\r
+void SwitchLocalBranchPage::DoDataExchange(CDataExchange* pDX)\r
+{\r
+       CPropertyPage::DoDataExchange(pDX);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(SwitchLocalBranchPage, CPropertyPage)\r
+END_MESSAGE_MAP()\r
+\r
+\r
+// SwitchLocalBranchPage message handlers\r

diff --git a/src/TortoiseProc/SwitchLocalBranchPage.h b/src/TortoiseProc/SwitchLocalBranchPage.h
new file mode 100644 (file)
index 0000000..95a12e1
--- /dev/null
+++ b/src/TortoiseProc/SwitchLocalBranchPage.h
@@ -0,0 +1,21 @@
+#pragma once\r
+\r
+\r
+// SwitchLocalBranchPage dialog\r
+\r
+class SwitchLocalBranchPage : public CPropertyPage\r
+{\r
+       DECLARE_DYNAMIC(SwitchLocalBranchPage)\r
+\r
+public:\r
+       SwitchLocalBranchPage();\r
+       virtual ~SwitchLocalBranchPage();\r
+\r
+// Dialog Data\r
+       enum { IDD = IDD_SWITCH_LOCAL_BRANCH };\r
+\r
+protected:\r
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
+\r
+       DECLARE_MESSAGE_MAP()\r
+};\r

diff --git a/src/TortoiseProc/SwitchTagPage.cpp b/src/TortoiseProc/SwitchTagPage.cpp
new file mode 100644 (file)
index 0000000..90118b6
--- /dev/null
+++ b/src/TortoiseProc/SwitchTagPage.cpp
@@ -0,0 +1,33 @@
+// SwitchTagPage.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "SwitchTagPage.h"\r
+\r
+\r
+// CSwitchTagPage dialog\r
+\r
+IMPLEMENT_DYNAMIC(CSwitchTagPage, CPropertyPage)\r
+\r
+CSwitchTagPage::CSwitchTagPage()\r
+       : CPropertyPage(CSwitchTagPage::IDD)\r
+{\r
+\r
+}\r
+\r
+CSwitchTagPage::~CSwitchTagPage()\r
+{\r
+}\r
+\r
+void CSwitchTagPage::DoDataExchange(CDataExchange* pDX)\r
+{\r
+       CPropertyPage::DoDataExchange(pDX);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CSwitchTagPage, CPropertyPage)\r
+END_MESSAGE_MAP()\r
+\r
+\r
+// CSwitchTagPage message handlers\r

diff --git a/src/TortoiseProc/SwitchTagPage.h b/src/TortoiseProc/SwitchTagPage.h
new file mode 100644 (file)
index 0000000..c89861d
--- /dev/null
+++ b/src/TortoiseProc/SwitchTagPage.h
@@ -0,0 +1,21 @@
+#pragma once\r
+\r
+\r
+// CSwitchTagPage dialog\r
+\r
+class CSwitchTagPage : public CPropertyPage\r
+{\r
+       DECLARE_DYNAMIC(CSwitchTagPage)\r
+\r
+public:\r
+       CSwitchTagPage();\r
+       virtual ~CSwitchTagPage();\r
+\r
+// Dialog Data\r
+       enum { IDD = IDD_SWITCH_TAG1 };\r
+\r
+protected:\r
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
+\r
+       DECLARE_MESSAGE_MAP()\r
+};\r

diff --git a/src/TortoiseProc/SwitchVersionPage.cpp b/src/TortoiseProc/SwitchVersionPage.cpp
new file mode 100644 (file)
index 0000000..ae317ab
--- /dev/null
+++ b/src/TortoiseProc/SwitchVersionPage.cpp
@@ -0,0 +1,33 @@
+// SwitchVersionPage.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "SwitchVersionPage.h"\r
+\r
+\r
+// CSwitchVersionPage dialog\r
+\r
+IMPLEMENT_DYNAMIC(CSwitchVersionPage, CPropertyPage)\r
+\r
+CSwitchVersionPage::CSwitchVersionPage()\r
+       : CPropertyPage(CSwitchVersionPage::IDD)\r
+{\r
+\r
+}\r
+\r
+CSwitchVersionPage::~CSwitchVersionPage()\r
+{\r
+}\r
+\r
+void CSwitchVersionPage::DoDataExchange(CDataExchange* pDX)\r
+{\r
+       CPropertyPage::DoDataExchange(pDX);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CSwitchVersionPage, CPropertyPage)\r
+END_MESSAGE_MAP()\r
+\r
+\r
+// CSwitchVersionPage message handlers\r

diff --git a/src/TortoiseProc/SwitchVersionPage.h b/src/TortoiseProc/SwitchVersionPage.h
new file mode 100644 (file)
index 0000000..d219ea8
--- /dev/null
+++ b/src/TortoiseProc/SwitchVersionPage.h
@@ -0,0 +1,21 @@
+#pragma once\r
+\r
+\r
+// CSwitchVersionPage dialog\r
+\r
+class CSwitchVersionPage : public CPropertyPage\r
+{\r
+       DECLARE_DYNAMIC(CSwitchVersionPage)\r
+\r
+public:\r
+       CSwitchVersionPage();\r
+       virtual ~CSwitchVersionPage();\r
+\r
+// Dialog Data\r
+       enum { IDD = IDD_SWITCH_VERSION };\r
+\r
+protected:\r
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
+\r
+       DECLARE_MESSAGE_MAP()\r
+};\r

diff --git a/src/TortoiseProc/SwtichRemoteBranchPage.cpp b/src/TortoiseProc/SwtichRemoteBranchPage.cpp
new file mode 100644 (file)
index 0000000..1898f53
--- /dev/null
+++ b/src/TortoiseProc/SwtichRemoteBranchPage.cpp
@@ -0,0 +1,33 @@
+// SwtichRemoteBranchPage.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "SwtichRemoteBranchPage.h"\r
+\r
+\r
+// CSwtichRemoteBranchPage dialog\r
+\r
+IMPLEMENT_DYNAMIC(CSwtichRemoteBranchPage, CPropertyPage)\r
+\r
+CSwtichRemoteBranchPage::CSwtichRemoteBranchPage()\r
+       : CPropertyPage(CSwtichRemoteBranchPage::IDD)\r
+{\r
+\r
+}\r
+\r
+CSwtichRemoteBranchPage::~CSwtichRemoteBranchPage()\r
+{\r
+}\r
+\r
+void CSwtichRemoteBranchPage::DoDataExchange(CDataExchange* pDX)\r
+{\r
+       CPropertyPage::DoDataExchange(pDX);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CSwtichRemoteBranchPage, CPropertyPage)\r
+END_MESSAGE_MAP()\r
+\r
+\r
+// CSwtichRemoteBranchPage message handlers\r

diff --git a/src/TortoiseProc/SwtichRemoteBranchPage.h b/src/TortoiseProc/SwtichRemoteBranchPage.h
new file mode 100644 (file)
index 0000000..ffac764
--- /dev/null
+++ b/src/TortoiseProc/SwtichRemoteBranchPage.h
@@ -0,0 +1,21 @@
+#pragma once\r
+\r
+\r
+// CSwtichRemoteBranchPage dialog\r
+\r
+class CSwtichRemoteBranchPage : public CPropertyPage\r
+{\r
+       DECLARE_DYNAMIC(CSwtichRemoteBranchPage)\r
+\r
+public:\r
+       CSwtichRemoteBranchPage();\r
+       virtual ~CSwtichRemoteBranchPage();\r
+\r
+// Dialog Data\r
+       enum { IDD = IDD_SWITCH_REMOTEL_BRANCH };\r
+\r
+protected:\r
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
+\r
+       DECLARE_MESSAGE_MAP()\r
+};\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index 101a718..da79e05 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -566,11 +566,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -806,19 +806,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\open.ico"\r
+                               RelativePath=".\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\open.ico"\r
+                               RelativePath="..\Resources\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -922,19 +922,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\saveas.ico"\r
+                               RelativePath=".\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\saveas.ico"\r
+                               RelativePath="..\Resources\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1026,11 +1026,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1261,6 +1261,10 @@
                                        >\r
                                </File>\r
                        </Filter>\r
+                       <Filter\r
+                               Name="branch"\r
+                               >\r
+                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Utility Dialogs"\r
@@ -1282,6 +1286,14 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\CreateBranchTagDlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\CreateBranchTagDlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\FileDiffDlg.cpp"\r
                                >\r
                        </File>\r
@@ -1290,6 +1302,14 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\GitSwitch.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\GitSwitch.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\ProgressDlg.cpp"\r
                                >\r
                        </File>\r
@@ -1333,6 +1353,38 @@
                                RelativePath=".\SVNProgressDlg.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\SwitchLocalBranchPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SwitchLocalBranchPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SwitchTagPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SwitchTagPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SwitchVersionPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SwitchVersionPage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SwtichRemoteBranchPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SwtichRemoteBranchPage.h"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Git"\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
index 99ba314..86af789 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
+++ b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
@@ -11,7 +11,7 @@
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
                                WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
-                               CommandArguments="/command:push /path:&quot;D:\\Profiles\\b20596\\qgit4&quot;"\r
+                               CommandArguments="/command:push /path:&quot;D:\\Profiles\\b20596\\buildtest\\TortoiseGit&quot;"\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index a7a1ef4..1ce7af5 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ