Update Change Log and add puttygen.exe to manage tortoiseplink key.

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/ext/putty/pageant.exe b/ext/putty/pageant.exe
new file mode 100644 (file)
index 0000000..ea2379b
Binary files /dev/null and b/ext/putty/pageant.exe differ

diff --git a/ext/putty/puttygen.exe b/ext/putty/puttygen.exe
new file mode 100644 (file)
index 0000000..c548873
Binary files /dev/null and b/ext/putty/puttygen.exe differ

diff --git a/src/Changelog.txt b/src/Changelog.txt
index 1031b6b..9fcf264 100644 (file)
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -1,3 +1,43 @@
+Version 0.4.0.0 version(internal)\r
+Features:\r
+       *Full Overlay Icon Support.\r
+        Show "Conflict, ignore file, untracked file, modified, Add, staged" icon according to file status. \r
+\r
+       *Rebase Support.\r
+         Support "Pick" "Sqaush" "Edit" and "Skip" commit when rebase branch. \r
+         Support abort.\r
+       \r
+       *Combine Multi-commits to one commit.\r
+        Combine continous commits to one commit. The limition is the only single line(no merge point) above combined commit.\r
+\r
+       *Cherry Pick multi commits. \r
+        User can use multi commits at log dialog and then choose cherry pick these. Cherry Pick dialog guide you finish whole work. \r
+         Support "Pick" "Squash" "Edit" and "Skip" commits.\r
+       \r
+       *First x64 version. \r
+\r
+       *Support version "browse" at switch, export, new branch/tag and merge dialogs.\r
+\r
+       *Add context menu item "Revert" at Commit dialog File List.\r
+\r
+       *Show bold font for HEAD at log dialog.\r
+       \r
+       *Add "Whole Project" checkbox at commit dialog\r
+\r
+       *First Version Help Document. \r
+\r
+Bug Fix:\r
+       *Fix issue 36, Push not working if no remote branch is specified\r
+       *Default UnCheck untrack file at commit dialog\r
+       *Issue 40:  Commit from subfolder shows unversioned files in parent\r
+       *Fix diff problem when filenames have embedded spaces\r
+       *Fix Issue 24,45, Commit results not in window with scroll bars\r
+       *Fix for win2k context menu icons\r
+       *Fix Issue 46, The about window title still displays TortoiseSVN\r
+       *Fix Issue 37, When the file name contains Chinese char, Diff doesn't work. \r
+       *Fix Issue 28, "Add" status icon overlay is not correct.  \r
+\r
+\r
 version 0.3.3.0 version(external)\r
        *Disable file overlay icon at vista system to avoid explore crash\r
        *File overlay default is enable at XP system. User can disable it by setting dialog. \r

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index 2b8e3d0..0cd83c0 100644 (file)
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -48,8 +48,7 @@
 \r
           <Component Id="C__infofiles" Guid="$(var.GuidInfoFiles)" Win64="$(var.Win64YesNo)">\r
             <File Id="F__changelog" ShortName="CHANGELG.TXT" Name="Changelog.txt" DiskId="1" Source="..\Changelog.txt" KeyPath="yes" />\r
-<!--            <File Id="F__subversionlicense" ShortName="LICENSES.TXT" Name="Subversion license.txt" DiskId="1" Source="..\..\ext\Subversion\subversion\LICENSE" />\r
--->            <File Id="F__tortoisesvnlicense" ShortName="LICENSE.TXT" Name="TortoiseGit License.txt" DiskId="1" Source="..\gpl.txt" />\r
+            <File Id="F__tortoisesvnlicense" ShortName="LICENSE.TXT" Name="TortoiseGit License.txt" DiskId="1" Source="..\gpl.txt" />\r
             <File Id="F__openssllicense" ShortName="OSSL_LIC.TXT" Name="OpenSSL License.txt" DiskId="1" Source="include\OpenSSL_License.txt" />\r
 <!--            <File Id="F__aprlicense" ShortName="APR_LIC.TXT" Name="apr License.txt" DiskId="1" Source="..\..\ext\apr\LICENSE" />\r
  -->           <File Id="F__sasllicense" ShortName="CYRUSSAS.TXT" Name="CyrusSASL License.txt" DiskId="1" Source="include\CyrusSASL_License.txt" />\r
@@ -225,9 +224,8 @@ out everything for now, leaving these enabled as they are would make the install
             <?endif ?>\r
 \r
             <Component Id="C__help_en" Guid="$(var.GuidHelpEN)" Win64="$(var.Win64YesNo)">\r
-<!--             <File Id="F_TortoiseSVN_en" ShortName="TSVNHELP.CHM" Name="TortoiseSVN_en.chm" DiskId="1" Source="..\..\doc\output\TortoiseSVN_en.chm" KeyPath="yes" />\r
-              <File Id="F__TortoiseMerge_en" ShortName="TMEHELP.CHM" Name="TortoiseMerge_en.chm" DiskId="1" Source="..\..\doc\output\TortoiseMerge_en.chm" />\r
--->               <RemoveFile Id="F__Tortoise_lang"  Name="*.chm" On="uninstall" />\r
+              <File Id="F_TortoiseGit_en" ShortName="TSVNHELP.CHM" Name="TortoiseGit_en.chm" DiskId="1" Source="..\..\doc\output\TortoiseGit_en.chm" KeyPath="yes" />\r
+              <File Id="F__TortoiseMerge_en" ShortName="TMEHELP.CHM" Name="TortoiseMerge_en.chm" DiskId="1" Source="..\..\doc\output\TortoiseMerge_en.chm" />               <RemoveFile Id="F__Tortoise_lang"  Name="*.chm" On="uninstall" />\r
             </Component>\r
 \r
             <Component Id="C__wingit" Guid="$(var.GuidGitLib)" Win64="$(var.Win64YesNo)">\r
@@ -237,10 +235,12 @@ out everything for now, leaving these enabled as they are would make the install
             \r
             <Component Id="C__TortoiseSVN" Guid="$(var.GuidTortoiseSVN)" Win64="$(var.Win64YesNo)">\r
               <File Id="F__TortoiseProc" ShortName="TORTPROC.EXE" Name="TortoiseProc.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseProc.exe" KeyPath="yes" />\r
-              <File Id="F__TortoiseShell" ShortName="TORTGIT.DLL" Name="TortoiseGit.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseGit.dll" />\r
+              <File Id="F__TortoiseShell" ShortName="TORTGIT.DLL" Name="TortoiseGit.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseGit.dll" />                 \r
 <!--              <File Id="F__TortoiseStub" ShortName="TORTSTB.DLL" Name="TortoiseStub.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseStub.dll" />\r
 -->\r
                          <File Id="F__TortoisePlink" ShortName="TORTPLI.EXE" Name="TortoisePlink.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoisePlink.exe" />\r
+                         <File Id="F__PuttyGen"      ShortName="puttygen.EXE" Name="puttygen.exe" DiskId="1" Source="..\..\ext\putty\puttygen.exe" />\r
+                         <File Id="F__pageant"       ShortName="pageant.EXE" Name="pageant.exe" DiskId="1" Source="..\..\ext\putty\pageant.exe" />\r
 \r
               <File Id="F__TSVNCache" ShortName="TGITCACH.EXE" Name="TGitCache.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TGitCache.exe" />\r
               <File Id="F__TSVNAutolist" ShortName="AUTOLIST.TXT" Name="autolist.txt" DiskId="1" Source="include\autolist.txt" />\r

diff --git a/src/version.h b/src/version.h
index 4e65b65..8edd788 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,11 +1,11 @@
-#define FILEVER        0,3,3,0\r
-#define PRODUCTVER     0,3,3,0\r
-#define STRFILEVER     "0, 3, 3, 0\0"\r
-#define STRPRODUCTVER  "0, 3, 3, 0\0"\r
+#define FILEVER        0,4,1,0\r
+#define PRODUCTVER     0,4,1,0\r
+#define STRFILEVER     "0, 4, 1, 0\0"\r
+#define STRPRODUCTVER  "0, 4, 1, 0\0"\r
 \r
 #define TSVN_VERMAJOR             0\r
-#define TSVN_VERMINOR             3\r
-#define TSVN_VERMICRO             3\r
+#define TSVN_VERMINOR             4\r
+#define TSVN_VERMICRO             1\r
 #define TSVN_VERBUILD                    0\r
 #define TSVN_VERDATE                     "date unknown\n"\r
 \r