Upgrade version number for gitdll zlib libcurl

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

diff --git a/ext/gitdll/gitdll.rc2 b/ext/gitdll/gitdll.rc2
new file mode 100644 (file)
index 0000000..ff3bcef
--- /dev/null
+++ b/ext/gitdll/gitdll.rc2
@@ -0,0 +1,49 @@
+// Microsoft Visual C++ generated resource script.\r
+//\r
+\r
+#ifdef APSTUDIO_INVOKED\r
+#error this file is not editable by Microsoft Visual C++\r
+#endif //APSTUDIO_INVOKED\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+// Add manually edited resources here...\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Version\r
+//\r
+#include "..\..\src\version.h"\r
+VS_VERSION_INFO VERSIONINFO\r
+ FILEVERSION FILEVER\r
+ PRODUCTVERSION PRODUCTVER\r
+ FILEFLAGSMASK 0x3fL\r
+#ifdef _DEBUG\r
+ FILEFLAGS 0x1L\r
+#else\r
+ FILEFLAGS 0x0L\r
+#endif\r
+ FILEOS 0x4L\r
+ FILETYPE VFT_APP\r
+ FILESUBTYPE 0x0L\r
+BEGIN\r
+    BLOCK "StringFileInfo"\r
+    BEGIN\r
+        BLOCK "040004e4"\r
+        BEGIN\r
+                       VALUE "CompanyName", "http://code.google.com/p/tortoisegit\0"\r
+            VALUE "FileDescription", "git dll\0"\r
+            VALUE "FileVersion", STRFILEVER\r
+            VALUE "InternalName", "gitdll.dll\0"\r
+            VALUE "LegalCopyright", "Copyright (C) 2003-2010 - TortoiseGit\0"\r
+            VALUE "OriginalFilename", "gitdll.dll\0"\r
+            VALUE "ProductName", "TortoiseGit\0"\r
+            VALUE "ProductVersion", STRPRODUCTVER\r
+        END\r
+    END\r
+    BLOCK "VarFileInfo"\r
+    BEGIN\r
+        VALUE "Translation", 0x400, 1252\r
+    END\r
+END\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r

diff --git a/ext/gitdll/gitdll.vcproj b/ext/gitdll/gitdll.vcproj
index 7211e11..da8c3d2 100644 (file)
--- a/ext/gitdll/gitdll.vcproj
+++ b/ext/gitdll/gitdll.vcproj
@@ -384,6 +384,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\resource.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\stdafx.h"\r
                                >\r
                        </File>\r
@@ -397,6 +401,10 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
+                       <File\r
+                               RelativePath=".\gitdll.rc"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <File\r
                        RelativePath=".\ReadMe.txt"\r

diff --git a/ext/libcurl b/ext/libcurl
index a0b6cd2..28e2a94 160000 (submodule)
--- a/ext/libcurl
+++ b/ext/libcurl
@@ -1 +1 @@
-Subproject commit a0b6cd277b831a0de965c26dd135bc7b2036c150
+Subproject commit 28e2a94d82c0dc05ca424adc46d65cf67b9179c2

diff --git a/ext/tgit b/ext/tgit
index 82efe12..40511df 160000 (submodule)
--- a/ext/tgit
+++ b/ext/tgit
@@ -1 +1 @@
-Subproject commit 82efe1205d4ff3ee6986d8a52bb690ff94521033
+Subproject commit 40511df57298544f322701a80abfe5c9f6a0a625

diff --git a/ext/zlib b/ext/zlib
index 0021f22..2a715a6 160000 (submodule)
--- a/ext/zlib
+++ b/ext/zlib
@@ -1 +1 @@
-Subproject commit 0021f229e74c96c1f160429a94145a6830a1e2fc
+Subproject commit 2a715a6797ccb036b9c1c95fa088a41934476462

diff --git a/src/Changelog.txt b/src/Changelog.txt
index 78bb42f..41e130d 100644 (file)
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -1,4 +1,11 @@
-= Release 1.3.1.0=\r
+= Release 1.3.2.0 =\r
+== Bug Fix ==\r
+* Fixed issue #276: Crash on seeing diff with previous version\r
+* Fixed issue #275: Load gitweb for 'Browse' button\r
+* Fixed issue #265: Log dialog: Date picker throws multiple error messages when date is before 1.1.1970\r
+* Fix RefLogDlg crash\r
+\r
+= Release 1.3.1.0 =\r
 == Features ==\r
  * Improve Log Dialog. Speed up log fetch speed. \r
    Build Git source as a DLL. LogDialog will call gitdll to fetch log instead of capture git.exe output.\r

diff --git a/src/Resources/TortoiseGitBlame.rc b/src/Resources/TortoiseGitBlame.rc
index 3096c3d..0695134 100644 (file)
--- a/src/Resources/TortoiseGitBlame.rc
+++ b/src/Resources/TortoiseGitBlame.rc
@@ -280,43 +280,6 @@ BEGIN
 END\r
 \r
 \r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Version\r
-//\r
-\r
-VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,0,0,1\r
- PRODUCTVERSION 1,0,0,1\r
- FILEFLAGSMASK 0x3fL\r
-#ifdef _DEBUG\r
- FILEFLAGS 0x1L\r
-#else\r
- FILEFLAGS 0x0L\r
-#endif\r
- FILEOS 0x4L\r
- FILETYPE 0x1L\r
- FILESUBTYPE 0x0L\r
-BEGIN\r
-    BLOCK "StringFileInfo"\r
-    BEGIN\r
-        BLOCK "040904e4"\r
-        BEGIN\r
-            VALUE "CompanyName", "TortoiseGit Blame"\r
-            VALUE "FileDescription", "TortoiseGit Blame Program"\r
-            VALUE "FileVersion", "1.0.0.1"\r
-            VALUE "InternalName", "TortoiseGitBlame.exe"\r
-            VALUE "LegalCopyright", "TortoiseGit.  All rights reserved."\r
-            VALUE "OriginalFilename", "TortoiseGitBlame.exe"\r
-            VALUE "ProductName", "TortoiseGit"\r
-            VALUE "ProductVersion", "1.0.0.1"\r
-        END\r
-    END\r
-    BLOCK "VarFileInfo"\r
-    BEGIN\r
-        VALUE "Translation", 0x409, 1252\r
-    END\r
-END\r
 \r
 \r
 /////////////////////////////////////////////////////////////////////////////\r

diff --git a/src/TortoiseGitBlame/res/TortoiseGitBlame.rc2 b/src/TortoiseGitBlame/res/TortoiseGitBlame.rc2
index cb34520..8148427 100644 (file)
--- a/src/TortoiseGitBlame/res/TortoiseGitBlame.rc2
+++ b/src/TortoiseGitBlame/res/TortoiseGitBlame.rc2
@@ -16,4 +16,45 @@
 #include "..\Resources\TortoiseCommon.rc2"\r
 /////////////////////////////////////////////////////////////////////////////\r
 \r
+/////////////////////////////////////////////////////////////////////////////\r
+// Add manually edited resources here...\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Version\r
+//\r
+#include "..\version.h"\r
+VS_VERSION_INFO VERSIONINFO\r
+ FILEVERSION FILEVER\r
+ PRODUCTVERSION PRODUCTVER\r
+ FILEFLAGSMASK 0x3fL\r
+#ifdef _DEBUG\r
+ FILEFLAGS 0x1L\r
+#else\r
+ FILEFLAGS 0x0L\r
+#endif\r
+ FILEOS 0x4L\r
+ FILETYPE VFT_APP\r
+ FILESUBTYPE 0x0L\r
+BEGIN\r
+    BLOCK "StringFileInfo"\r
+    BEGIN\r
+        BLOCK "040004e4"\r
+        BEGIN\r
+                       VALUE "CompanyName", "http://code.google.com/p/tortoisegit\0"\r
+            VALUE "FileDescription", "TortoiseGitBlame\0"\r
+            VALUE "FileVersion", STRFILEVER\r
+            VALUE "InternalName", "TortoiseGitBlame.exe\0"\r
+            VALUE "LegalCopyright", "Copyright (C) 2003-2008 - TortoiseSVN\0"\r
+            VALUE "OriginalFilename", "TortoiseGitBlame.exe\0"\r
+            VALUE "ProductName", "TortoiseGitBlame\0"\r
+            VALUE "ProductVersion", STRPRODUCTVER\r
+        END\r
+    END\r
+    BLOCK "VarFileInfo"\r
+    BEGIN\r
+        VALUE "Translation", 0x400, 1252\r
+    END\r
+END\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
 \r

diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi
index 1686422..dcdd56e 100644 (file)
--- a/src/TortoiseGitSetup/VersionNumberInclude.wxi
+++ b/src/TortoiseGitSetup/VersionNumberInclude.wxi
@@ -2,6 +2,6 @@
 <Include Id="VersionNumberInclude">
        <?define MajorVersion="1" ?>
        <?define MinorVersion="3" ?>
-       <?define MicroVersion="1" ?>
+       <?define MicroVersion="2" ?>
        <?define BuildVersion="0" ?>
 </Include>

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index 8bd68e4..ac6001a 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -48,7 +48,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\ext\gitdll;..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell;..\..\ext\gitdll"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="2"\r
@@ -138,7 +138,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\ext\gitdll;..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell;..\..\ext\gitdll"\r
                                PreprocessorDefinitions="WIN64;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="2"\r
@@ -224,7 +224,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\ext\gitdll;..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell;..\..\ext\gitdll"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"\r
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
@@ -319,7 +319,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\ext\gitdll;..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell;..\..\ext\gitdll"\r
                                PreprocessorDefinitions="WIN64;_WINDOWS;NDEBUG;THESAURUS"\r
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
@@ -588,11 +588,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\copy.ico"\r
+                               RelativePath="..\Resources\copy.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\copy.ico"\r
+                               RelativePath=".\copy.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -620,11 +620,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -868,11 +868,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -904,11 +904,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\refresh.ico"\r
+                               RelativePath="..\Resources\refresh.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\refresh.ico"\r
+                               RelativePath=".\refresh.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -984,11 +984,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1088,11 +1088,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r

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