update guuid

diff --git a/TortoiseShell/Guids.h b/TortoiseShell/Guids.h
index 2fb0b8d..b61bcca 100644 (file)
--- a/TortoiseShell/Guids.h
+++ b/TortoiseShell/Guids.h
@@ -38,37 +38,52 @@
 //          you MUST change the GUID below.  Simply run UUIDGEN.EXE\r
 //          to generate a new GUID.\r
 //\r
-// {D5D59708-3617-47ce-B33D-EE90AA32E695}\r
+// {451C7E59-058F-450a-8C42-FE9A12A302FC}\r
 DEFINE_GUID(CLSID_Tortoisegit_UPTODATE, \r
-0xd5d59708, 0x3617, 0x47ce, 0xb3, 0x3d, 0xee, 0x90, 0xaa, 0x32, 0xe6, 0x95);\r
-// {C933681D-183F-4f4e-B89E-8A55961B30A3}\r
+0x451C7E59, 0x058F, 0x450a, 0x8C, 0x42, 0xFE, 0x9A, 0x12, 0xA3, 0x02, 0xFC);\r
+\r
+// {8DA7CDCB-DC0B-4246-80BD-812E942734AF}\r
 DEFINE_GUID(CLSID_Tortoisegit_MODIFIED, \r
-0xc933681d, 0x183f, 0x4f4e, 0xb8, 0x9e, 0x8a, 0x55, 0x96, 0x1b, 0x30, 0xa3);\r
-// {345016EA-536E-470c-AE7B-E71C4772D307}\r
+0x8DA7CDCB, 0xDC0B, 0x4246, 0x80, 0xBD, 0x81, 0x2E, 0x94, 0x27, 0x34, 0xAF);\r
+\r
+// {30351348-7B7D-4FCC-81B4-1E394CA267EB}\r
 DEFINE_GUID(CLSID_Tortoisegit_CONFLICTING, \r
-0x345016ea, 0x536e, 0x470c, 0xae, 0x7b, 0xe7, 0x1c, 0x47, 0x72, 0xd3, 0x7);\r
-// {EB6EFAC1-D893-4b2b-8344-8A759787F307}\r
+0x30351348, 0x7B7D, 0x4FCC, 0x81, 0xB4, 0x1E, 0x39, 0x4C, 0xA2, 0x67, 0xEB);\r
+\r
+// {10A0FDD2-B0C0-4cd4-A7AE-E594CE3B91C8}\r
 DEFINE_GUID(CLSID_Tortoisegit_UNCONTROLLED, \r
-0xeb6efac1, 0xd893, 0x4b2b, 0x83, 0x44, 0x8a, 0x75, 0x97, 0x87, 0xf3, 0x7);\r
-// {87678FDD-B442-4ca6-A97B-9DD24EA61C04}\r
+0x10A0FDD2, 0xB0C0, 0x4cd4, 0xA7, 0xAE, 0xE5, 0x94, 0xCE, 0x3B, 0x91, 0xC8);\r
+\r
+\r
+// {6A4800FA-13B4-4cb4-9A37-97E7FAEDA731}\r
 DEFINE_GUID(CLSID_Tortoisegit_DROPHANDLER, \r
-0x87678fdd, 0xb442, 0x4ca6, 0xa9, 0x7b, 0x9d, 0xd2, 0x4e, 0xa6, 0x1c, 0x4);\r
-// {FBE9C21C-72A4-40fa-953A-B291BE9EF5E6}\r
+0x6A4800FA, 0x13B4, 0x4cb4, 0x9A, 0x37, 0x97, 0xE7, 0xFA, 0xED, 0xA7, 0x31);\r
+\r
+\r
+// {5F380D0B-EE64-479b-B2AD-EF437BF4B0A6}\r
 DEFINE_GUID(CLSID_Tortoisegit_READONLY, \r
 0xfbe9c21c, 0x72a4, 0x40fa, 0x95, 0x3a, 0xb2, 0x91, 0xbe, 0x9e, 0xf5, 0xe6);\r
-// {5B3A0C83-9450-48be-8657-D18DC9741396}\r
+\r
+\r
+// {D69716CD-6993-4d0d-898F-5EBBC25C5D4D}\r
 DEFINE_GUID(CLSID_Tortoisegit_DELETED, \r
-0x5b3a0c83, 0x9450, 0x48be, 0x86, 0x57, 0xd1, 0x8d, 0xc9, 0x74, 0x13, 0x96);\r
-// {BE7EBA87-DD97-48ea-A0EB-5DC949A310AE}\r
+0xD69716CD, 0x6993, 0x4d0d, 0x89, 0x8F, 0x5E, 0xBB, 0xC2, 0x5C, 0x5D, 0x4D);\r
+\r
+\r
+// {4E453CBA-2AAB-465c-A01E-627A7BE9ED73}\r
 DEFINE_GUID(CLSID_Tortoisegit_LOCKED, \r
-0xbe7eba87, 0xdd97, 0x48ea, 0xa0, 0xeb, 0x5d, 0xc9, 0x49, 0xa3, 0x10, 0xae);\r
-// {8F9EF5A9-93AD-4ba0-A139-116222ADDCC6}\r
+0x4E453CBA, 0x2AAB, 0x465c, 0xa0, 0x1E, 0x62, 0x7A, 0x7B, 0xE9, 0xED, 0x73);\r
+\r
+// {A38915E4-A460-4143-8D6B-0B45564C6A00}\r
 DEFINE_GUID(CLSID_Tortoisegit_ADDED, \r
-0x8f9ef5a9, 0x93ad, 0x4ba0, 0xa1, 0x39, 0x11, 0x62, 0x22, 0xad, 0xdc, 0xc6);\r
-// {179B603B-90F8-42ff-A5EB-FE364E3C23E5}\r
+0xA38915E4, 0xA460, 0x4143, 0x8D, 0x6B, 0x0B, 0x45, 0x56, 0x4C, 0x6A, 0x00);\r
+\r
+\r
+// {1B94B098-57C6-4c39-9DC5-8EB00E423D3E}\r
 DEFINE_GUID(CLSID_Tortoisegit_IGNORED, \r
-0x179b603b, 0x90f8, 0x42ff, 0xa5, 0xeb, 0xfe, 0x36, 0x4e, 0x3c, 0x23, 0xe5);\r
-// {EC9929CD-B045-4bd9-8E3D-6F7E805CD68A}\r
+0x1B94B098, 0x57C6, 0x4c39, 0x9D, 0xC5, 0x8E, 0xB0, 0x0E, 0x42, 0x3D, 0x3E);\r
+\r
+// {18BF1135-6EA2-405f-A71E-16EEE7F71F8B}\r
 DEFINE_GUID(CLSID_Tortoisegit_UNVERSIONED, \r
 0xec9929cd, 0xb045, 0x4bd9, 0x8e, 0x3d, 0x6f, 0x7e, 0x80, 0x5c, 0xd6, 0x8a);\r
 \r

diff --git a/TortoiseShell/TortoiseShell.vcproj b/TortoiseShell/TortoiseShell.vcproj
index 69511c9..6b9debe 100644 (file)
--- a/TortoiseShell/TortoiseShell.vcproj
+++ b/TortoiseShell/TortoiseShell.vcproj
@@ -20,8 +20,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="..\..\bin\Debug\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseShell\Debug"\r
+                       OutputDirectory="..\bin\Debug\bin"\r
+                       IntermediateDirectory="..\obj\TortoiseShell\Debug"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        UseOfATL="1"\r
@@ -91,7 +91,7 @@
                                ModuleDefinitionFile=".\ShellExt.def"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/TortoiseSVN.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)/TortoiseGit.pdb"\r
                                BaseAddress="0x5960000"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r

diff --git a/TortoiseShell/register.reg b/TortoiseShell/register.reg
index 7a1b66d..68644ab 100644 (file)
Binary files a/TortoiseShell/register.reg and b/TortoiseShell/register.reg differ