OSDN Git Service
Kimmo Varis [Thu, 1 Jul 2010 13:30:43 +0000 (13:30 +0000)]
Fixing 64-bit compile warnings.
Kimmo Varis [Thu, 1 Jul 2010 12:49:38 +0000 (12:49 +0000)]
Fix 64-bit build warnings in BCMenu.
Kimmo Varis [Thu, 1 Jul 2010 10:59:36 +0000 (10:59 +0000)]
Fix some 64-bit build warnings.
Kimmo Varis [Thu, 1 Jul 2010 09:25:10 +0000 (09:25 +0000)]
Win64: Put temp build files to BuildTmp folder as 32-bit builds do.
Kimmo Varis [Thu, 1 Jul 2010 08:36:46 +0000 (08:36 +0000)]
Update SCEW to 1.1.2
Jochen Tucht [Wed, 30 Jun 2010 05:34:17 +0000 (05:34 +0000)]
PATCH: [
3012200 ] Defer unicode conversion to diffutils
Kimmo Varis [Tue, 29 Jun 2010 21:11:39 +0000 (21:11 +0000)]
Update to PCRE 8.10.
Tim Gerundt [Tue, 29 Jun 2010 16:44:20 +0000 (16:44 +0000)]
Fix post build event for "X64 Debug" and "X64 Release" in pcreX64.vcproj
Tim Gerundt [Mon, 28 Jun 2010 14:30:33 +0000 (14:30 +0000)]
Fix post build event for "X64 Debug" and "X64 Release" in expatX64.vcproj
Tim Gerundt [Mon, 28 Jun 2010 10:58:17 +0000 (10:58 +0000)]
Fix translation paths in MergeLangX64.vcproj
Kimmo Varis [Sat, 19 Jun 2010 13:51:51 +0000 (13:51 +0000)]
Fix InnoSetup installer file by adding missing semicolon.
Kimmo Varis [Sat, 19 Jun 2010 13:02:44 +0000 (13:02 +0000)]
WinMerge experimental release 2.13.13. (SVN r7205)
Kimmo Varis [Sat, 19 Jun 2010 13:00:23 +0000 (13:00 +0000)]
Fix typo in release script.
Kimmo Varis [Sat, 19 Jun 2010 12:52:04 +0000 (12:52 +0000)]
Bump WinMerge version to 2.13.13 and Shellextension version to 1.16.3.
Kimmo Varis [Sat, 19 Jun 2010 12:46:49 +0000 (12:46 +0000)]
Translations: Update WinMerge POT and PO files.
Kimmo Varis [Sat, 19 Jun 2010 12:41:51 +0000 (12:41 +0000)]
Changelog: add recent bug fixes and improvements.
Kimmo Varis [Sat, 19 Jun 2010 12:23:00 +0000 (12:23 +0000)]
Restore changelog line that got removed when backing out patch.
Jan Hryz [Sat, 19 Jun 2010 07:40:16 +0000 (07:40 +0000)]
Update of translation
Tim Gerundt [Thu, 17 Jun 2010 20:16:49 +0000 (20:16 +0000)]
PATCH: [
3017674 ] New Serbian Language - Add ShellExtension changes
Tim Gerundt [Thu, 17 Jun 2010 19:37:02 +0000 (19:37 +0000)]
PATCH: [
3017674 ] New Serbian Language
Tim Gerundt [Thu, 17 Jun 2010 16:40:17 +0000 (16:40 +0000)]
PATCH: [
3014912 ] Installer: Set default language with MSI setup
Jochen Tucht [Thu, 17 Jun 2010 05:47:45 +0000 (05:47 +0000)]
PATCH: [
3016907 ] Fix Bug #
2968177 Ignoring comments wrongly recognizes // ...
Jochen Tucht [Mon, 14 Jun 2010 21:27:35 +0000 (21:27 +0000)]
Fix regression from MFC to STL string conversion committed as of revision 6865.
Jochen Tucht [Sun, 13 Jun 2010 20:02:50 +0000 (20:02 +0000)]
Add Merge7z914 to Merge7zInstaller
Jochen Tucht [Sun, 13 Jun 2010 20:01:22 +0000 (20:01 +0000)]
Add Merge7z914.vcxproj
Jochen Tucht [Sun, 13 Jun 2010 15:22:21 +0000 (15:22 +0000)]
fix a warning
Jochen Tucht [Sun, 13 Jun 2010 15:18:34 +0000 (15:18 +0000)]
Fix last commit breaking compilation due to "struct stat" vs. "struct _stat".
Jochen Tucht [Sun, 13 Jun 2010 14:58:54 +0000 (14:58 +0000)]
BUG: [
2982964 ] Wrong time stamp even in latest revision (NOT old bug)
Jochen Tucht [Sun, 13 Jun 2010 12:18:30 +0000 (12:18 +0000)]
CSortHeaderCtrl: Replace GetDllVersion() by SendMessage(CCM_GETVERSION), which works for comctl32.dll 5.80 and better.
As this removes the last reference to GetDllVersion(), we are now ready to drop dllver.cpp/.h.
Jochen Tucht [Sun, 13 Jun 2010 12:10:45 +0000 (12:10 +0000)]
Remove unnecessary #include "dllver.h"
Jochen Tucht [Sun, 13 Jun 2010 10:20:59 +0000 (10:20 +0000)]
PATCH: [
3015416 ] LineFiltersDlg: Employ listview in-place editing capability
Jochen Tucht [Sun, 13 Jun 2010 10:13:37 +0000 (10:13 +0000)]
PATCH: [
3015396 ] Remove obsolete dll version checks
Jochen Tucht [Sun, 13 Jun 2010 09:02:45 +0000 (09:02 +0000)]
CMergeDiffDetailView: Fix an inconsistency in m_lineBegin vs. m_lineEnd vs. m_diffLength, which was occurring after rescan.
Kimmo Varis [Sun, 13 Jun 2010 08:25:01 +0000 (08:25 +0000)]
Update 2.12.4 release notes to trunk.
Kimmo Varis [Sat, 12 Jun 2010 13:00:33 +0000 (13:00 +0000)]
Buildscript: Use Python's optparse module to parse command line.
Kimmo Varis [Sat, 12 Jun 2010 12:55:52 +0000 (12:55 +0000)]
BUG: #
2995925 No refreshing after merging difference
Revert revisions 7086 and 7089 to fix the regression.
Kimmo Varis [Sat, 12 Jun 2010 09:58:16 +0000 (09:58 +0000)]
Fix the changelog item - use the patch ID when it exists.
Kimmo Varis [Sat, 12 Jun 2010 09:56:48 +0000 (09:56 +0000)]
Changelog: Bugfix: Line filtering wasted huge amounts of memory
Jochen Tucht [Fri, 11 Jun 2010 19:59:11 +0000 (19:59 +0000)]
PATCH: [
3014162 ] Fix LineFilters wasting enormous amounts of memory
Jochen Tucht [Wed, 9 Jun 2010 06:22:56 +0000 (06:22 +0000)]
HexMergeView: Differences could fail to show up in left pane unless some action was taken that would cause a repaint (seen on Vista with OPT_SCROLL_TO_FIRST off).
Jochen Tucht [Sun, 6 Jun 2010 13:41:33 +0000 (13:41 +0000)]
Fix an apparent bug in to_utf8_advance()
Jochen Tucht [Wed, 2 Jun 2010 14:51:43 +0000 (14:51 +0000)]
VC2010 does not accept a dot to serve as a class resolution operator
Tim Gerundt [Wed, 2 Jun 2010 06:24:43 +0000 (06:24 +0000)]
Fix some batch files paths in Merge.vcproj
Tim Gerundt [Wed, 2 Jun 2010 06:19:33 +0000 (06:19 +0000)]
Fix CreateMasterPotFile calls in MergeLangX64.vcproj
Jochen Tucht [Wed, 19 May 2010 12:57:18 +0000 (12:57 +0000)]
Restart discussion about binary file detection (TODO #
1946860)
Jochen Tucht [Wed, 19 May 2010 12:25:14 +0000 (12:25 +0000)]
Fix possible access beyond end of memory mapped file
Jochen Tucht [Sun, 16 May 2010 15:19:15 +0000 (15:19 +0000)]
string_replace(): Fix infinite loop if (replace) contains an occurrence of (find) at a position greater than the length of (find).
Jochen Tucht [Sun, 16 May 2010 14:44:19 +0000 (14:44 +0000)]
• Read 7-Zip version from 7z.dll (which has long ago replaced the various format and codec DLLs)
• Change recommended version of 7-Zip to 4.65
Jochen Tucht [Sun, 16 May 2010 13:45:23 +0000 (13:45 +0000)]
VC2010 does not accept a dot to serve as a class resolution operator
Jochen Tucht [Sun, 16 May 2010 13:15:33 +0000 (13:15 +0000)]
Relate definition of NCHITTEST_RESULT to _MFC_VER, not _MSC_VER, to enable use of VS2010 Express in conjunction with MFC71
Jochen Tucht [Sun, 16 May 2010 12:05:13 +0000 (12:05 +0000)]
HexMerge issues:
• Fix initial child frame size when opening HexMerge from command line (not supported by now, but on my personal agenda)
• Child frame caption included entire path, which was not quite the intention
Jochen Tucht [Sat, 15 May 2010 14:04:43 +0000 (14:04 +0000)]
BUGFIX: HexMergeView was unable to load an empty file.
Jochen Tucht [Sat, 15 May 2010 13:57:32 +0000 (13:57 +0000)]
fix a warning
Jochen Tucht [Sat, 15 May 2010 13:20:17 +0000 (13:20 +0000)]
fix a warning
Jochen Tucht [Sat, 15 May 2010 13:14:27 +0000 (13:14 +0000)]
fix a warning
Jochen Tucht [Sat, 15 May 2010 13:08:22 +0000 (13:08 +0000)]
fix a warning
Tim Gerundt [Sat, 15 May 2010 12:48:38 +0000 (12:48 +0000)]
Fix manual URL in Merge7z/readme.txt
Jochen Tucht [Sat, 15 May 2010 12:44:12 +0000 (12:44 +0000)]
fix a warning
Jochen Tucht [Thu, 13 May 2010 12:04:45 +0000 (12:04 +0000)]
Merge7zInstaller: Base application specific installation on 7z465
Jochen Tucht [Thu, 13 May 2010 11:38:03 +0000 (11:38 +0000)]
Add Merge7zInstaller.vcxproj.* for VS2010
Jochen Tucht [Sun, 9 May 2010 21:42:02 +0000 (21:42 +0000)]
Merge7z DllBuild 0028
Kimmo Varis [Sun, 9 May 2010 12:06:24 +0000 (12:06 +0000)]
Takashi Sawanaka [Thu, 6 May 2010 17:49:21 +0000 (17:49 +0000)]
Japanese translation - update
Kimmo Varis [Tue, 4 May 2010 18:11:48 +0000 (18:11 +0000)]
PATCH: #
2919510 TimeSizecompare
Submitted by Matthias Mayer
Comparing files by size also always compared by time.
Kimmo Varis [Tue, 4 May 2010 17:46:42 +0000 (17:46 +0000)]
PATCH: #
2988369 FileFilterHelper using PCRE
Submitted by Matthias Mayer
Allows MS-DOS style pattern matching for Open-dialog filters.
Kimmo Varis [Tue, 4 May 2010 17:28:11 +0000 (17:28 +0000)]
Remove old VS2003 runtime files.
Kimmo Varis [Tue, 4 May 2010 17:26:43 +0000 (17:26 +0000)]
Installer: Embed MS runtime files installer for x64
Kimmo Varis [Mon, 3 May 2010 17:08:20 +0000 (17:08 +0000)]
BUG: #
2991932 delete[] applied to memory allocated by _tcsdup()
Spotted by Jochen.
Kimmo Varis [Thu, 29 Apr 2010 16:43:09 +0000 (16:43 +0000)]
WinMerge experimental release 2.13.12. (SVN r7148)
Tim Gerundt [Thu, 29 Apr 2010 12:42:42 +0000 (12:42 +0000)]
Docs: Add short note about website translation to Translations.html
Tim Gerundt [Thu, 29 Apr 2010 09:07:41 +0000 (09:07 +0000)]
Drop from web files from GetTranslationsStatus.py script
Kimmo Varis [Wed, 28 Apr 2010 18:02:11 +0000 (18:02 +0000)]
Update translation files.
Kimmo Varis [Wed, 28 Apr 2010 17:47:56 +0000 (17:47 +0000)]
Update version numbers to 2.13.12.
Kimmo Varis [Wed, 28 Apr 2010 17:28:04 +0000 (17:28 +0000)]
Remove Web folders as we now have separate Mercurial repository for web pages.
Kimmo Varis [Wed, 28 Apr 2010 17:05:50 +0000 (17:05 +0000)]
PATCH: #
2774357 EOL_MIXED
Submitted by Matthias Mayer
Kimmo Varis [Wed, 28 Apr 2010 16:11:09 +0000 (16:11 +0000)]
PATCH: #
2933033 No prediffer by menu
Submitted by Matthias Mayer
Kimmo Varis [Tue, 27 Apr 2010 19:44:53 +0000 (19:44 +0000)]
Update installer documentation.
Kimmo Varis [Tue, 27 Apr 2010 19:35:12 +0000 (19:35 +0000)]
Installer: Embed MS runtime files installer
Embed MS runtimes installer to our InnoSetup installer. This should solve
most installing problems users have had with our previous method of
installing all runtime files and manifest files one by one.
Kimmo Varis [Tue, 27 Apr 2010 19:24:07 +0000 (19:24 +0000)]
Installer: Fix couple of script syntax errors.
These were found after updating InnoSetup to latest version.
Kimmo Varis [Fri, 23 Apr 2010 17:34:32 +0000 (17:34 +0000)]
PATCH: [
2991295 ] Diff Pane doesn't show diffs (moved blocks)
Submitted by Matthias Mayer
Fixes bug #
2988656
Tim Gerundt [Fri, 23 Apr 2010 10:10:21 +0000 (10:10 +0000)]
Web: Use GZIP compression from PHP for CSS files too
Tim Gerundt [Fri, 23 Apr 2010 09:35:36 +0000 (09:35 +0000)]
Web: Use GZIP compression from PHP, since 1and1 don't support it from Apache
Tim Gerundt [Fri, 23 Apr 2010 08:57:43 +0000 (08:57 +0000)]
Web: Update Piwik java script code
Tim Gerundt [Fri, 23 Apr 2010 08:52:00 +0000 (08:52 +0000)]
Web: Don't prepare link for manual and tour
Tim Gerundt [Fri, 23 Apr 2010 08:46:54 +0000 (08:46 +0000)]
PATCH: [
2988974 ] Fix help locations
Kimmo Varis [Wed, 21 Apr 2010 16:31:24 +0000 (16:31 +0000)]
Update copyright year to 2010.
convert-repo [Thu, 15 Apr 2010 14:26:44 +0000 (14:26 +0000)]
update tags
Tim Gerundt [Mon, 15 Mar 2010 13:23:21 +0000 (13:23 +0000)]
PATCH: [
2968200 ] French.isl updated
Submitted by Jean-F Jolin
Kimmo Varis [Wed, 10 Mar 2010 21:03:58 +0000 (21:03 +0000)]
PATCH: [
2942869 ] Location Pane scrolling
Fixes bug #
2915350
Submitted by Matthias Mayer
Tim Gerundt [Wed, 3 Mar 2010 19:56:34 +0000 (19:56 +0000)]
Fix slight gramatical error in Contributors.txt
Submitted by Alex Clarke
Tim Gerundt [Fri, 19 Feb 2010 19:25:08 +0000 (19:25 +0000)]
PATCH: [
2951149 ] Updated polish language file
Submitted by Skiff
Tim Gerundt [Fri, 19 Feb 2010 19:03:56 +0000 (19:03 +0000)]
PATCH: [
2954833 ] Traditional Chinese Language File updated
Submitted by wck3
Tim Gerundt [Fri, 12 Feb 2010 16:47:48 +0000 (16:47 +0000)]
Web: Add link to WinMerge Facebook group
Tim Gerundt [Sat, 6 Feb 2010 14:09:37 +0000 (14:09 +0000)]
PATCH: [
2943964 ] A Swedish Swedish.isl and sv.po translation update
Submitted by Hans Eriksson
Tim Gerundt [Sat, 6 Feb 2010 13:23:09 +0000 (13:23 +0000)]
Drop "MakePatchDirs" from SVN_Organisation.txt
Tim Gerundt [Sat, 6 Feb 2010 13:00:14 +0000 (13:00 +0000)]
Fix small typo in Releasing.html developer file
Tim Gerundt [Sat, 6 Feb 2010 12:35:23 +0000 (12:35 +0000)]
Drop "MakePatchDirs" section from readme-developers.html
Takashi Sawanaka [Mon, 1 Feb 2010 14:24:51 +0000 (14:24 +0000)]
PATCH: [
2669526 ] ViewColor
Bug fix in HTML report
Tim Gerundt [Sat, 30 Jan 2010 08:41:09 +0000 (08:41 +0000)]
PATCH: [
2942365 ] Fix scewX64 VC project file
Tim Gerundt [Thu, 21 Jan 2010 19:42:51 +0000 (19:42 +0000)]
Web: Tweak detectLanguageFromBrowser() function from SimpleTranslate class