OSDN Git Service

(root) / tortoisegit / TortoiseGitJp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 217ae57)
Merge from feature_merge branch. Build TortoiseMerge successfully.
authorFrank Li <lznuaa@gmail.com>
Thu, 9 Apr 2009 02:43:13 +0000 (10:43 +0800)
committerFrank Li <lznuaa@gmail.com>
Thu, 9 Apr 2009 02:43:13 +0000 (10:43 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
.gitignore patch | blob | history
ext/svnbin/x64/TortoiseMerge.exe [new file with mode: 0644] patch | blob
ext/svnbin/x64/intl3_tsvn.dll [new file with mode: 0644] patch | blob
ext/svnbin/x64/libapr_tsvn.dll [new file with mode: 0644] patch | blob
ext/svnbin/x64/libaprutil_tsvn.dll [new file with mode: 0644] patch | blob
src/Changelog.txt patch | blob | history
src/TortoiseGit.sln patch | blob | history
src/TortoiseGitBlame/hlp/afx_hidd_filesave.htm patch | blob | history
src/TortoiseGitSetup/Includes.wxi patch | blob | history
src/TortoiseGitSetup/VersionNumberInclude.wxi patch | blob | history

diff --git a/.gitignore b/.gitignore
index d7be3cf..bc94dab 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,16 @@ obj
 *.ncb\r
 *.suo\r
 *.chm\r
+*.aps\r
 ext/scintilla/vcbuild/Release\r
 IBugTraqProvider_?.?\r
 /Tools\r
-/doc/output
\ No newline at end of file
+/doc/output\r
+/src/[Rr]elease\r
+/src/[Dd]ebug\r
+/src/*/[Rr]elease\r
+/src/*/[Dd]ebug\r
+/src/*/[Rr]elease_static\r
+/src/*/[Dd]ebug_static\r
+/Languages/[Rr]elease\r
+/Languages/[Dd]ebug\r
diff --git a/ext/svnbin/x64/TortoiseMerge.exe b/ext/svnbin/x64/TortoiseMerge.exe
new file mode 100644 (file)
index 0000000..b4379f4
Binary files /dev/null and b/ext/svnbin/x64/TortoiseMerge.exe differ
diff --git a/ext/svnbin/x64/intl3_tsvn.dll b/ext/svnbin/x64/intl3_tsvn.dll
new file mode 100644 (file)
index 0000000..7376c6e
Binary files /dev/null and b/ext/svnbin/x64/intl3_tsvn.dll differ
diff --git a/ext/svnbin/x64/libapr_tsvn.dll b/ext/svnbin/x64/libapr_tsvn.dll
new file mode 100644 (file)
index 0000000..a6b100f
Binary files /dev/null and b/ext/svnbin/x64/libapr_tsvn.dll differ
diff --git a/ext/svnbin/x64/libaprutil_tsvn.dll b/ext/svnbin/x64/libaprutil_tsvn.dll
new file mode 100644 (file)
index 0000000..ca41862
Binary files /dev/null and b/ext/svnbin/x64/libaprutil_tsvn.dll differ
diff --git a/src/Changelog.txt b/src/Changelog.txt
index 838913c..82b414d 100644 (file)
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -1,3 +1,7 @@
+Version 0.5.1.0 version(internal)\r
+Fix:\r
+       Issue 52:  TortoiseMerge crashes on x64  \r
+\r
 Version 0.5.0.0 version(internal)\r
 Features:\r
        *Submodule Support.\r
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
+               {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
diff --git a/src/TortoiseGitBlame/hlp/afx_hidd_filesave.htm b/src/TortoiseGitBlame/hlp/afx_hidd_filesave.htm
index 4d53bb5..317edf0 100644 (file)
--- a/src/TortoiseGitBlame/hlp/afx_hidd_filesave.htm
+++ b/src/TortoiseGitBlame/hlp/afx_hidd_filesave.htm
@@ -1,36 +1,72 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">\r\r
-<HTML>\r\r
-<HEAD>\r\r
-<META HTTP-EQUIV="Content-Type" Content="text/html; charset=Windows-1252">\r\r
-<TITLE>(File Save As dialog box)</TITLE>\r\r
-</HEAD>\r\r
-\r\r
-<BODY>\r\r
-\r\r
-\r\r
-<P><A NAME="afx_hidd_filesave"></A><B>File Save As dialog box</B></P>\r\r
-\r\r
-<P>The following options allow you to specify the name and location of the file you're about to save:</P>\r\r
-\r\r
-<P><B>File Name</B></P>\r\r
-\r\r
-<P>Specifies a file name to save a document with a different name.  &lt;&lt;YourApp&gt;&gt; adds the extension you specify in the\r\r
-<b> Save File As Type</b> box.</P>\r\r
-\r\r
-<P><B>Drives</B></P>\r\r
-\r\r
-<P>Specifies the drive in which you want to store the document.</P>\r\r
-\r\r
-<P><B>Directories</B></P>\r\r
-\r\r
-<P>Specifies the directory in which you want to store the document.</P>\r\r
-\r\r
-<P><B>Network</B></P>\r\r
-\r\r
-<P>Click this button to connect to a network location, assigning it a new drive letter. </P>\r\r
-\r\r
-<P>&lt;&lt; Add other <b> File Save As</b> dialog box options depending on which ones your application chooses\r\r
-through the OFN_ flags of the OPENFILENAME structure used by the CFileDialog. &gt;&gt;</P>\r\r
-\r\r
-</BODY>\r\r
-</HTML>\r\r
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">\r
+\r
+<HTML>\r
+\r
+<HEAD>\r
+\r
+<META HTTP-EQUIV="Content-Type" Content="text/html; charset=Windows-1252">\r
+\r
+<TITLE>(File Save As dialog box)</TITLE>\r
+\r
+</HEAD>\r
+\r
+\r
+\r
+<BODY>\r
+\r
+\r
+\r
+\r
+\r
+<P><A NAME="afx_hidd_filesave"></A><B>File Save As dialog box</B></P>\r
+\r
+\r
+\r
+<P>The following options allow you to specify the name and location of the file you're about to save:</P>\r
+\r
+\r
+\r
+<P><B>File Name</B></P>\r
+\r
+\r
+\r
+<P>Specifies a file name to save a document with a different name.  &lt;&lt;YourApp&gt;&gt; adds the extension you specify in the\r
+\r
+<b> Save File As Type</b> box.</P>\r
+\r
+\r
+\r
+<P><B>Drives</B></P>\r
+\r
+\r
+\r
+<P>Specifies the drive in which you want to store the document.</P>\r
+\r
+\r
+\r
+<P><B>Directories</B></P>\r
+\r
+\r
+\r
+<P>Specifies the directory in which you want to store the document.</P>\r
+\r
+\r
+\r
+<P><B>Network</B></P>\r
+\r
+\r
+\r
+<P>Click this button to connect to a network location, assigning it a new drive letter. </P>\r
+\r
+\r
+\r
+<P>&lt;&lt; Add other <b> File Save As</b> dialog box options depending on which ones your application chooses\r
+\r
+through the OFN_ flags of the OPENFILENAME structure used by the CFileDialog. &gt;&gt;</P>\r
+\r
+\r
+\r
+</BODY>\r
+\r
+</HTML>\r
+\r
diff --git a/src/TortoiseGitSetup/Includes.wxi b/src/TortoiseGitSetup/Includes.wxi
index 58a5b98..2c308dc 100644 (file)
--- a/src/TortoiseGitSetup/Includes.wxi
+++ b/src/TortoiseGitSetup/Includes.wxi
@@ -100,7 +100,9 @@
        <?define GuidIconsXPStyle="96412A1D-3EE2-4874-8CFC-8EF4D0E36467"?>\r
        <?define GuidIconsMarkPhippard="9151E386-6DD8-45a8-8C04-EBEBD9D8E179"?>\r
        <?define GuidIconsStraight="669EE534-B358-489e-AD81-544A32172FE7"?>\r
-\r
+  <?define RegSSHPLINK="112230AA-AB13-4667-AD78-DC8EBEA2ED26"?>\r
+  <?define RegSSHOpen="0E21B3B2-FA54-411b-9AF3-BB275F169A27"?>\r
+  \r
        <?else?>\r
 \r
        <?define GuidInfoFiles="424219CC-2F91-49ad-B0EF-DB6A61575C99"?>\r
diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi
index 5f56913..d3be647 100644 (file)
--- a/src/TortoiseGitSetup/VersionNumberInclude.wxi
+++ b/src/TortoiseGitSetup/VersionNumberInclude.wxi
@@ -2,6 +2,6 @@
 <Include Id="VersionNumberInclude">\r
        <?define MajorVersion="0" ?>\r
        <?define MinorVersion="5" ?>\r
-       <?define MicroVersion="0" ?>\r
+       <?define MicroVersion="1" ?>\r
        <?define BuildVersion="0" ?>\r
 </Include>\r
TortoiseGit日本語言語ファイル作成
About OSDN
Find Software
Develop Software
Help