Update version number to 1.2.1.0

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

diff --git a/src/Changelog.txt b/src/Changelog.txt
index 78bb731..5c6e7da 100644 (file)
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -1,3 +1,33 @@
+= Release 1.2.1.0 =\r
+== Features ==\r
+ * Add color success and fail at ProgressDlg\r
+ \r
+ * Log Dialog\r
+   Show work copy to log dialog. User can commit change at log dialog.\r
+   Easy to compare with working copy difference\r
+  \r
+ * Allow Alt+O in commit dialog for OK \r
+ \r
+ * Sync Dialog remote URL support save history\r
+   \r
+ * Add remote branch and current branch at proptery page  \r
+ \r
+ * Add no-commit option at merge dialog\r
+  \r
+ * Enable IBugTraqProvide CheckCommit and OnCommitFinished\r
+ \r
+== Bug Fix ==\r
+ * Fixed issue #219: Blame Error when git repository is at root directory and path use "/"\r
+ * Fixed issue #214: installer inserts unused or faulty registry key\r
+ * Fixed issue #179: Log dialog lacks information about changed files\r
+ * Fixed issue #209: High CPU usage in tortoiseproc.exe & limit line number\r
+ * Fixed issue #212: Disable the "Select items automaticlly" option has no effect to commit files dialog\r
+ * Fixed issue #209: High CPU usage in tortoiseproc.exe & Append text to edit ctrl\r
+ * Fixed Issue #203:  Remote URL select box in sync dialog is not populated with remotes.\r
+ * Fixed Issue #208:  During push (from context menu), branches missing from drop down list.\r
+ * Fixed issue #86: Globally sets HOME affecting third-party applications (GNU Emacs) \r
+ * Fixed issue #188: Add Git Properties tab into Windows File Properties\r
+\r
 = Release 1.1.1.0 =\r
 == Features ==\r
  \r

diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi
index 741c7f4..607d977 100644 (file)
--- a/src/TortoiseGitSetup/VersionNumberInclude.wxi
+++ b/src/TortoiseGitSetup/VersionNumberInclude.wxi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include Id="VersionNumberInclude">
        <?define MajorVersion="1" ?>
-       <?define MinorVersion="1" ?>
+       <?define MinorVersion="2" ?>
        <?define MicroVersion="1" ?>
        <?define BuildVersion="0" ?>
 </Include>

diff --git a/src/version.h b/src/version.h
index 1486f33..7a477cb 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,10 +1,10 @@
-#define FILEVER        1,1,1,0
-#define PRODUCTVER     1,1,1,0
-#define STRFILEVER     "1, 1, 1, 0\0"
-#define STRPRODUCTVER  "1, 1, 1, 0\0"
+#define FILEVER        1,2,1,0
+#define PRODUCTVER     1,2,1,0
+#define STRFILEVER     "1, 2, 1, 0\0"
+#define STRPRODUCTVER  "1, 2, 1, 0\0"
 
 #define TSVN_VERMAJOR             1
-#define TSVN_VERMINOR             1
+#define TSVN_VERMINOR             2
 #define TSVN_VERMICRO             1
 #define TSVN_VERBUILD                    0
 #define TSVN_VERDATE                     "date unknown\n"