From e91989d08580f982178d221c47ec02d3adc2953a Mon Sep 17 00:00:00 2001 From: Frank Li Date: Fri, 1 May 2009 22:19:28 +0800 Subject: [PATCH] Update Version Number --- src/Changelog.txt | 24 ++++++++++++++++++++++++ src/TortoiseGitSetup/VersionNumberInclude.wxi | 4 ++-- src/version.h | 10 +++++----- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 82b414d..9216b1d 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -1,3 +1,27 @@ +Version 0.6.1.0 version(internal) +Features: + *TortoiseMerge Support git format patch file. + TortoiseMerge can open git patch file and review diff and merge change. + + *SendMail support + Right click .patch or .diff file, click "send mail..." to send patch out. + + *improve clone dialog + Add auto fill module name at directory when change URL. Fix tab order. + + +Fix: + Issue 73: Error while reading/writing the registry key MSysGit Access is denied + Issue 11: Show differences as unified diff does not use selected item + Issue 77: "Show differencess" against a deleted file will cause TortoiseMerge to error + Issue 74: Add multiple files from commit dialog only adds first two in multi-selection + Issue 75: About box does not show version information + Wrong error message when fail launch pageant + Setup will launch old version msi to remove old version. Directly update to new version without remove old version + Double click conflict item to launch diffview, not conflict edit. + Issue 66 in tortoisegit: Some log lines lose color or disappear after you click on them + + Version 0.5.1.0 version(internal) Fix: Issue 52: TortoiseMerge crashes on x64 diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi index d51ecbd..ed68248 100644 --- a/src/TortoiseGitSetup/VersionNumberInclude.wxi +++ b/src/TortoiseGitSetup/VersionNumberInclude.wxi @@ -2,6 +2,6 @@ - - + + diff --git a/src/version.h b/src/version.h index dcf6ef3..608f56f 100644 --- a/src/version.h +++ b/src/version.h @@ -1,11 +1,11 @@ -#define FILEVER 0,6,0,0 -#define PRODUCTVER 0,6,0,0 -#define STRFILEVER "0, 6, 0, 0\0" -#define STRPRODUCTVER "0, 6, 0, 0\0" +#define FILEVER 0,6,1,0 +#define PRODUCTVER 0,6,1,0 +#define STRFILEVER "0, 6, 1, 0\0" +#define STRPRODUCTVER "0, 6, 1, 0\0" #define TSVN_VERMAJOR 0 #define TSVN_VERMINOR 6 -#define TSVN_VERMICRO 0 +#define TSVN_VERMICRO 1 #define TSVN_VERBUILD 0 #define TSVN_VERDATE "date unknown\n" -- 2.11.0