From 389492b13b41821ef95ae94c0ac40eefb7b0db6f Mon Sep 17 00:00:00 2001 From: Frank Li Date: Sun, 6 Sep 2009 11:49:21 +0800 Subject: [PATCH] Update version number to 1.0.2.0 Signed-off-by: Frank Li --- ext/zlib | 2 +- src/Changelog.txt | 5 +++++ src/TortoiseGitSetup/VersionNumberInclude.wxi | 2 +- src/version.h | 10 +++++----- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ext/zlib b/ext/zlib index 62cb93c..38f92b4 160000 --- a/ext/zlib +++ b/ext/zlib @@ -1 +1 @@ -Subproject commit 62cb93cb25e2fbdbc89f90249cd8a024afad8a94 +Subproject commit 38f92b4cc122a3d44c88538ba06a136807c91821 diff --git a/src/Changelog.txt b/src/Changelog.txt index 548fbd3..5b9f22b 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -1,3 +1,8 @@ += Release 1.0.2.0 = +== Bug Fix == + * Fixed issue #155: Fix SVN Rebase sets upstream as remotes/trunk + * Fixed issue #157: Move progress dlg before rebase dialog SVN Rebase doesn't fast-forward + = Release 1.0.1.0 = == Features == diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi index 77a8796..7584c8a 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 e3ef322..dad9071 100644 --- a/src/version.h +++ b/src/version.h @@ -1,11 +1,11 @@ -#define FILEVER 1,0,1,0 -#define PRODUCTVER 1,0,1,0 -#define STRFILEVER "1, 0, 1, 0\0" -#define STRPRODUCTVER "1, 0, 1, 0\0" +#define FILEVER 1,0,2,0 +#define PRODUCTVER 1,0,2,0 +#define STRFILEVER "1, 0, 2, 0\0" +#define STRPRODUCTVER "1, 0, 2, 0\0" #define TSVN_VERMAJOR 1 #define TSVN_VERMINOR 0 -#define TSVN_VERMICRO 1 +#define TSVN_VERMICRO 2 #define TSVN_VERBUILD 0 #define TSVN_VERDATE "date unknown\n" -- 2.11.0