Merge from feature_merge branch. Build TortoiseMerge successfully.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseGit.sln

diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln
index ae7a548..bc5ea85 100644 (file)
--- a/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@ -36,6 +36,7 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixSetup", "TortoiseGitSetu
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475} = {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}\r
                {A5498556-CE09-4095-8335-08FC8370552D} = {A5498556-CE09-4095-8335-08FC8370552D}\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC} = {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475} = {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}\r
                {A5498556-CE09-4095-8335-08FC8370552D} = {A5498556-CE09-4095-8335-08FC8370552D}\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC} = {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}\r

+               {E8C01071-3B47-4A3F-9168-AA58A4635638} = {E8C01071-3B47-4A3F-9168-AA58A4635638}\r

                {72EFB681-1397-4193-BBF9-CA05AC52B75D} = {72EFB681-1397-4193-BBF9-CA05AC52B75D}\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB} = {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20} = {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D} = {72EFB681-1397-4193-BBF9-CA05AC52B75D}\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB} = {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20} = {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}\r