View source
R2_14
  • Contributors
    1. Loading...
Author Commit Message Date Builds
250+ commits behind default.
Jochen Tucht
PATCH: [ 3016907 ] Fix Bug #2968177 Ignoring comments wrongly recognizes // ... (merge from trunk revision 7195)
Jochen Tucht
Cleanup. Remove unused return value from method. (merge from trunk revision 7091)
Jochen Tucht
Make DIFFRANGE::op and respective function parameters type-safe (merge from trunk revision 7222)
Jochen Tucht
BUG: [ 2982964 ] Wrong time stamp even in latest revision (NOT old bug)
Jochen Tucht
fix a warning
Jochen Tucht
PATCH: [ 3012200 ] Defer unicode conversion to diffutils
Tim Gerundt
PATCH: [ 3164982 ] Hungarian language file Submitted by Mihalicza József
Tim Gerundt
Update copyright to 2011
Tim Gerundt
VC2010 does not accept a dot to serve as a class resolution operator
Tim Gerundt
Fix couple of 64-bit build warnings.
Tim Gerundt
PATCH: #3010934 custom code as String or integer Fixes bug item #2813825 Patch submitted by Matthias Mayer
Tim Gerundt
Add new OptionsPanel class as base class for WinMerge option dialogs.
Tim Gerundt
Rename CProp* classes to Prop* to keep them named in same way.
Tim Gerundt
Fix a signed vs. unsigned warning
Tim Gerundt
Optimize merging list of differences. Give diff number instead of activating diff and letting code to determine active difference for every diff.
Tim Gerundt
PATCH: [ 2931558 ] some smal cleanups mergedoc7097.patch Submitted by Matthias Mayer
Tim Gerundt
PATCH: [ 2921555 ] selected codepage is not used Fixes bug #2907951. Submitted by Matthias Mayer.
Tim Gerundt
Make few variables consts.
Tim Gerundt
Make SanityCheckDiff() a const method. Its task is to check diffs not modify anything.
Tim Gerundt
Automatic rescanning was not disabled everywhere. Add forced rescan after loading documents (spotted by Matthias).
Tim Gerundt
Remove some MFC code.
Tim Gerundt
Remove the MFC dependency from DirItem.cpp.
Tim Gerundt
BUG: [ 2774677 ] Large Files crash WinMerge... Limit linebuffer growth speed.
Tim Gerundt
Make bunch of editor functions const functions.
Tim Gerundt
Code cleanup. Don't return reference to pointer but the pointer itself. cppcheck also gave a memory leak error from this code: [DiffItemList.cpp:39]: Memory leak: p
Tim Gerundt
Code style fixes and fix a warning
Tim Gerundt
Remove unneeded includes, fix io.h to be system include.
Tim Gerundt
Don't edit file filters through FileFilterHelper. Removes CMainFrame dependency from FileFilterHelper.
Tim Gerundt
PATCH: [ 2919475 ] plug in error after ESC in foldercompare Submitted by Matthias Mayer
Tim Gerundt
Fix warning about memicmp()
Tim Gerundt
Fix possible access beyond end of memory mapped file
Tim Gerundt
Fix an apparent bug in to_utf8_advance()
Tim Gerundt
Couple of 64-bit build fixes. Fix types to use correct pointer types. Fix offset to use 64-bit size.
Tim Gerundt
Make UniError::GetError() a const method.
Tim Gerundt
Move Wiki to wiki.winmerge.org
Tim Gerundt
Move HTML version of WinMerge Help to manual.winmerge.org
Tim Gerundt
PATCH: [ 2942869 ] Location Pane scrolling Fixes bug #2915350 Submitted by Matthias Mayer
Tim Gerundt
Relate definition of NCHITTEST_RESULT to _MFC_VER, not _MSC_VER, to enable use of VS2010 Express in conjunction with MFC71
Tim Gerundt
Drop WinMerge.exe.manifest
Tim Gerundt
Add OptionsMgr::Set*() for setting new value for the option without saving to storage. Convert reading config log file to use these methods. - Forgot to remove ::
Tim Gerundt
Add some comments to ProjectFile.cpp
Tim Gerundt
BUG: [ 2890961 ] Creation of matching folder is wrong in recursive view mode
Tim Gerundt
BUG: [ 2817546 ] Copy pathname appends CRLF to path
Tim Gerundt
Use paths_ConcatPath() to combine paths.
Tim Gerundt
Add OptionsMgr::Set*() for setting new value for the option without saving to storage. Convert reading config log file to use these methods.
Tim Gerundt
Use SaveOption() to save option value instead of Set*().
Tim Gerundt
Fix some 64-bit build warnings.
Tim Gerundt
Astyle formatting.
Tim Gerundt
Update copyright year to 2010.
Tim Gerundt
PATCH: [ 2894123 ] Drop codepage translations
Tim Gerundt
Use paths_ConcatPath() to combine paths.
Tim Gerundt
Remove unneeded string conversions.
Tim Gerundt
PATCH: [ 3126794 ] Set icon in Add/Remove Programs with MSI setup
Tim Gerundt
PATCH: [ 3117406 ] Drop GetClipTcharTextFormat() function
Tim Gerundt
Installer: Install VS2008 runtimes merge modules. - Change feature title also to 2008
Tim Gerundt
Drop a batch file, which was accidentally committed
Tim Gerundt
PATCH: [ 3116407 ] Drop _UNICODE preprocessor definition
Tim Gerundt
PATCH: [ 3116422 ] Drop dirtools.[cpp|h]
Tim Gerundt
PATCH: [ 3114577 ] Drop IsUnicodeBuild() function
Tim Gerundt
PATCH: [ 3109521 ] Crash after deleting text Submitted by Lars Wittenburg
Tim Gerundt
PATCH: [ 3111581 ] Keeps verifing path even turned off in options
Tim Gerundt
PATCH: [ 3104374 ] Drop UNICODE preprocessor definition
Tim Gerundt
PATCH: [ 3109525 ] Crash when pasting from clipboard Submitted by Lars Wittenburg
Tim Gerundt
PATCH: [ 3014162 ] Fix LineFilters wasting enormous amounts of memory
Tim Gerundt
Catch out of memory error when converting byte array to string.
Tim Gerundt
Move FFILEOPEN_* flags to Constants.h so they are available in non-MFC code. Also they aren't property of CMainFrame.
Tim Gerundt
PATCH: #2919510 TimeSizecompare Submitted by Matthias Mayer Comparing files by size also always compared by time.
Tim Gerundt
PATCH: [ 2805717 ] Refactor Date/Size compare to own compare engine
Tim Gerundt
PATCH: [ 2929005 ] Quickcompare and EOL Fixes bug #2210403 Submitted by Matthias Mayer
Tim Gerundt
Remove MFC dependency from ByteComparator class.
Tim Gerundt
Remove MFC dependency from DiffItem.
Tim Gerundt
Unify DIFFITEM method naming and remove unused method.
Tim Gerundt
Move some string/char functions from StdAfx.cpp to new string_utils.cpp file. This allows using those functions from non-MFC code.
Tim Gerundt
PATCH: [ 2919477 ] plugin remove double call Submitted by Matthias Mayer
Tim Gerundt
PATCH: [ 2651372 ] paths_GetLastSubdir Submitted by Matthias Mayer
Tim Gerundt
Drop heksedit project from UpgradeProjects.py in R2_14
Tim Gerundt
PATCH: [ 2923684 ] GUI Language update Fixes bug #2808178 Submitted by Matthias Mayer
Tim Gerundt
Fix some whitespaces in R2_14
Tim Gerundt
PATCH: [ 2725549 ] Set a codepage with command-line parameter Submitted by bulklodd <bulklodd@users.sourceforge.net>
Tim Gerundt
RFE [ 2827836 ] Auto Close if Compare is the Same
Tim Gerundt
Fix a 64 bit issue
Tim Gerundt
Disable patch #3026022 for WIN64 due to issues as per bug #3089575 - Revert also changes from MergeX64.vcproj
Kimmo Varis
PATCH: #2818451 Improve color options organization
Kimmo Varis
PATCH: #2092180 Allow editing context line count in patch creator
Kimmo Varis
Merge UnicodeString from trunk.
Kimmo Varis
Buildscript: Remove building of ANSI targets.
Kimmo Varis
Buildscript: Remove building of hexedit library.
Tim Gerundt
PATCH: [ 3099867 ] Drop Ansi config from ShellExtension project
Jochen Tucht
Disable patch #3026022 for WIN64 due to issues as per bug #3089575
Tim Gerundt
Add missing SCEW files to R2_14
Tim Gerundt
Drop Heksedit from versions.txt in Externals directory
Tim Gerundt
PATCH: [ 3061941 ] Drop X64 * configs from x64 project
Tim Gerundt
PATCH: [ 3095046 ] Drop Ansi config from x86 project - Forgot to remove two lines in WinMerge.sln
Tim Gerundt
PATCH: [ 3059318 ] Drop Ansi config from x64 project
Tim Gerundt
Drop heksedit from WinMergeX64.sln in R2_14
Jochen Tucht
Merge from trunk: • 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
PATCH: [ 3026022 ] Turn STL exceptions into MFC exceptions
Jochen Tucht
Merge from trunk: GetSysError(nerr) -> GetSysError(nerr).c_str()
Jochen Tucht
Merge from trunk: GetSysError(nerr) -> GetSysError(nerr).c_str()
Jochen Tucht
Merge from trunk: GetSysError(nerr) -> GetSysError(nerr).c_str()
Jochen Tucht
Merge from trunk: GetSysError(nerr) -> GetSysError(nerr).c_str()
Jochen Tucht
Restore HexMerge related code which was removed for 2.12.
Tim Gerundt
Drop ANSI config from PreLink.bat - R2_14
Tim Gerundt
PATCH: [ 3095046 ] Drop Ansi config from x86 project
Jochen Tucht
IDR_POPUP_DIRVIEW MENU - revised wording as discussed in forum
Kimmo Varis
Remove hexedit from WinMerge sources. 2.14 branch also now uses the editor component from installed Frhed.
Kimmo Varis
Changelog: Updated PCRE and SCEW.
Kimmo Varis
Revert heksedit project file update accidentally committed with PCRE update commit.
Kimmo Varis
Fix copying compiled pcre files.
Kimmo Varis
Upgrade PCRE to version 8.10.
Kimmo Varis
Fix compile after SCEW update.
Kimmo Varis
Upgrade SCEW to version 1.1.2.
Kimmo Varis
BuildScript: Fix building and copying ShellExtension DLLs.
Kimmo Varis
UpdgradeProjects: Add heksedit.vcproj as we still use it in 2.14 Branch.
Kimmo Varis
Installer: Fix ShellExtension DLL paths.
Kimmo Varis
BuildScript: Merge error checking improvements from trunk.
Kimmo Varis
BuildScript: Check that InnoSetup is installed.
Kimmo Varis
BuildScript: Fix creating InnoSetup installer. Need to CD to InnoSetup installer file's folder before building the installer.
Kimmo Varis
Merge PostBuild.bat and Prelink.bat fixes for latest VS versions from trunk.
Kimmo Varis
BuildScript: Upgrade VS project files before building them.
Kimmo Varis
BuildScript: Don't copy/use VS2003 runtime files.
Kimmo Varis
BuildScript: Use OptParse to parse command line.
Kimmo Varis
BuildScript: Use ToolSettings.py.
Kimmo Varis
BuildScript: Update/fix 64-bit ShellExtension building from trunk.
Kimmo Varis
Remove unneeded ShellExtensionX64.vcproj project file and update 64-bit ShellExtension compiling instructions.
Kimmo Varis
Update ShellExtension project file and def file from trunk. This adds 64-bit target to "normal" project file.
Kimmo Varis
Scripts: Make ToolSettings.py to work in 64-bit Windows.
Tim Gerundt
PATCH: [ 3093207 ] Delete dllver files
Kimmo Varis
Upgrade VS solution / project files to VS 2005 versions.
Tim Gerundt
Bugfix: FileVersion class didn't never set product version variables properly. - R2_14
Tim Gerundt
Remove MFC dependency from FileVersion(.cpp). - R2_14
Tim Gerundt
Remove MFC dependency from CompareStats class. - R2_14 (Forgot the CompareStats.h file)
Tim Gerundt
Remove MFC dependency from CompareStats class. - R2_14
Tim Gerundt
Remove MFC dependency from CompareOptions class. - R2_14
Tim Gerundt
PATCH: [ 2205583 ] Use new compare status icons for editor windows - The other part was committed with r7278
Tim Gerundt
Update developers docs style in R2_14
Tim Gerundt
PATCH: [ 3015416 ] LineFiltersDlg: Employ listview in-place editing capability
Tim Gerundt
Remove unnecessary #include "dllver.h" - R2_14
Tim Gerundt
PATCH: [ 3015396 ] Remove obsolete dll version checks
Tim Gerundt
CSortHeaderCtrl: Replace GetDllVersion() by SendMessage(CCM_GETVERSION), which works for comctl32.dll 5.80 and better. - R2_14
Tim Gerundt
Remove unused variables in R2_14
Tim Gerundt
PATCH: [ 2823536 ] Add accelerator keys for Shell context menu
Tim Gerundt
Initialize folder selection dialog to currently selected folder in options dialog - R2_14
Tim Gerundt
BUG: [ 3025855 ] Untranslated strings in folder compare window
Chri...@hotmail.com
Update to reflect the experimental released yesterday at revision 7319
Tim Gerundt
Remove MFC dependency from varprop class in R2_14
Tim Gerundt
Fix whitespace in "CompareEngines" files from R2_14
Tim Gerundt
Fix whitespace in unicoder.[cpp|h] and UniFile.[cpp|h] from R2_14
Tim Gerundt
PATCH: [ 2638608 ] Autoprediff
Tim Gerundt
PATCH: [ 2788142 ] Improve startup time
Kimmo Varis
Scripts: Support VS2010 and make VS2008 default.
Tim Gerundt
BUG: [ 2791093 ] TortoiseSVN integration should omit -x
Chri...@hotmail.com
Upped the version numbers to match the experimental release 2.15.20, and also increased the ShellExtension version number to be higher than what we currently use in trunk.
Kimmo Varis
PATCH: [ 2726531 ] Show XML config files like XML files Submitted by bulklodd
Kimmo Varis
RFE: [ 2203904 ] "Include Subfolders": Enable Keyboard for Collapse/Expand
Kimmo Varis
PATCH: [ 2600787 ] Remove copy to left at context menu Submitted by Dmitry Maslov
Tim Gerundt
Fix whitespace in DirView.[cpp|h] from R2_14
Tim Gerundt
Fix whitespace in ShellExtension sources from R2_14
Tim Gerundt
Drop "Denis Bradford" as normal contributor in Contributors.txt in R2_14
Tim Gerundt
PATCH: [ 3042393 ] add ascx to Highlightsyntax ASP
Chri...@hotmail.com
PATCH: [ 3088720 ] Add OpenCandy to the InnoSetup installer This is using the OpenCandy 1.4.2.28 Inno SDK. The WinMerge.iss is including a file OpenCandyKeys.iss which is not included. This file contains the private keys for WinMerge, and can be obtained from the WinMerge administrators if you are creating the WinMerge releases. If you just want to use the installer without the WinMerge keys, then remove this line: #include <OpenCandyKeys.iss> This makes…
Tim Gerundt
Fixing 64-bit build warnings in R2_14
Tim Gerundt
Fixing 64-bit build warnings in R2_14
Tim Gerundt
PATCH: [ 3075470 ] Backport MSI setup to R2_14
Tim Gerundt
Use cscript for UpdatePoFilesFromPotFile.vbs in MergeLangX64.vcproj from R2_14
Tim Gerundt
Made MergeX64.vcproj compilable in R2_14
Tim Gerundt
Drop ShellExtension.dll and WinMerge.exe from Files.txt in R2_14
Tim Gerundt
Add "Denis Bradford" and fix "Hasan Osmanagiæ" in Contributors.txt in R2_14
Tim Gerundt
Merge CreateMasterPotFile.vbs and GetTranslationsStatus.vbs changes to R2_14
Tim Gerundt
PATCH: [ 3082392 ] Updated Bulgarian Language
Denis Bradford
Restore doc content and tour.css that was omitted during branch from 2.12 to 2.14.
Denis Bradford
Add tour files from 2.12, missing in 2.14 branch.
Denis Bradford
Update changes to doc tour build from 12.2.
Denis Bradford
Manually merge doc build changes not included in merge from 2_12 branch
Tim Gerundt
PATCH: [ 3079966 ] Installer: Don't install quick launch icon for Windows 7
Tim Gerundt
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Tim Gerundt
PATCH: [ 3078012 ] Drop text encoding note from manual
Tim Gerundt
Fix invalid syntax in ShellExtension project file from WinMerge 2.14
Kimmo Varis
Docs: Add 2.14 branch to SVN doc.
Kimmo Varis
Remove (old version) of CppUnit sources.
Tim Gerundt
BUG: [ 3033325 ] copy and advance: toolbar icons not automatically enabled
Tim Gerundt
BUG: [ 3022292 ] Location pane focus enabled "Save"
Tim Gerundt
Installer: Drop heksedit.dll from InnoSetup for WinMerge 2.14
Tim Gerundt
Docs: Update InnoSetup readme file for WinMerge 2.14
Jochen Tucht
Merge from trunk: Tolerate irregular whitespace in command lines.
Jochen Tucht
Merge HexMerge* changes from trunk. This does not reenable the feature though, as decision whether to do so is up to Kimmo.
Tim Gerundt
Drop website sources from SVN - We use now a bitbucket project for the website
Tim Gerundt
Drop readme file from MakePatchDirs too
Kimmo Varis
Merging misc documentation updates from trunk to 2.14 branch.
Kimmo Varis
Remove VS2003 runtime files from 2.14 branch.
Kimmo Varis
Remove the MakePatchDirs tool from 2.14 branch. This tool hasn't been maintained or actively used for a long time so we don't want to ship it with stable release.
Kimmo Varis
Update version number in 2.14 branch to 2.13.19.
Kimmo Varis
Create a 2.14.x stable release branch.
Tim Gerundt
PATCH: [ 3070254 ] Backport InnoSetup changes to R2_12
Tim Gerundt
PATCH: [ 3070136 ] Backport Slovenian shell extension to R2_12
Tim Gerundt
PATCH: [ 3065119 ] Backport Persian and Serbian languages to R2_12 - Add Subversion properties
Takashi Sawanaka
BUG: [3056008] About Winmerge & Microsoft Security Advisory (2269637)
Tim Gerundt
PATCH: [ 3065119 ] Backport Persian and Serbian languages to R2_12
Kimmo Varis
Bump version as this is more than normal stable update.
Kimmo Varis
Merge some script updates/fixes from trunk.
Tim Gerundt
BUG: [ 3033324 ] Chinese (trad.): "Alt + <key>" has extra space
Tim Gerundt
PATCH: [ 2988974 ] Fix help locations
Tim Gerundt
PATCH: [ 2968200 ] French.isl updated Submitted by Jean-F Jolin
Tim Gerundt
Fix slight gramatical error in Contributors.txt Submitted by Alex Clarke
Tim Gerundt
PATCH: [ 2934354 ] Final Slovenian translation for stable and unstable Submitted by Filip Komar
Tim Gerundt
PATCH: [ 2932094 ] Updated Slovenian translation for stable and unstable trunk Submitted by Filip Komar
Tim Gerundt
Fix wrong Content-Type meta declaration in Slovenian.po
Tim Gerundt
PATCH: [ 2917796 ] Updated and corrected Slovenian translation Submitted by Filip Komar
Tim Gerundt
PATCH: [ 2930734 ] Winmerge 2.12.4 Spanish Update and Corrected Submitted by Mario Angel
Kimmo Varis
Update version numbers for 2.12.6 stable release.
Kimmo Varis
Update date to the release notes.
Kimmo Varis
Release notes update for 2.12.6 stable release.
Kimmo Varis
PATCH: [ 2834543 ] Wrong message for open ConfigLog Submitted by Matthias Mayer
Tim Gerundt
PATCH: [ 2850842 ] French translation
Tim Gerundt
PATCH: [ 2834192 ] Add missing keywords to Pascal highlighter
Tim Gerundt
PATCH: [ 2827817 ] Turkish Translation - NEW- (Stable Branch)
Tim Gerundt
PATCH: [ 2825132 ] ShellExtension - Turkish Translation
Kimmo Varis
PATCH: [ 2817835 ] Ukrainian translation update Submitted by Warrior
Tim Gerundt
PATCH: [ 2804979 ] Updated Dutch translation (+ ShellExtension)
Kimmo Varis
WinMerge stable release 2.12.4 (SVN revision 6833)
Kimmo Varis
Docs: Update release notes for 2.12.4 stable release.
Kimmo Varis
PATCH: [ 2802427 ] Foldercompare method changed Submitted by Matthias Mayer, edited by Kimmo
Kimmo Varis
Update version numbers for 2.12.4 stable release.
Denis Bradford
Merge doc changes r:6202-6814 from trunk to 2.12 branch
Kimmo Varis
Update WinMerge version number in manual to 2.12.4.
Kimmo Varis
PATCH: [ 2799149 ] export settings Submitted by Matthias Mayer
Kimmo Varis
BUG: [ 2791506 ] Wrong Timestamps in Generaged Patch First patch and fix idea submitted by Liisachan (seelie at sourceforge)
Kimmo Varis
Add "Match Similar Lines"-option to config log.
Kimmo Varis
BUG: [ 2022312 ] Opening mixed-EOL file forces other side to be mixed
Kimmo Varis
PATCH: [ 2791402 ] Mainfrm.cpp Submitted by Matthias Mayer
Kimmo Varis
Make sure My Documents/WinMerge folder exists before creating config log there.Related to patch #2789839.
Kimmo Varis
PATCH: [ 2789839 ] Write config log to My Documents/Documents
Kimmo Varis
BUG: [ 2787131 ] Prediffer plugins still selectable, if plugins disabled
Denis Bradford
Bug 2714147: improved description of line differences.
Takashi Sawanaka
BUG: [ 2789345 ] "##" in file filter pattern causes an infinite loop
Tim Gerundt
BUG: [ 2783477 ] Generated Report: Inaccurate DOCTYPE
Kimmo Varis
PATCH: [ 2776705 ] Add more types for CPP syntax highlight
Takashi Sawanaka
BUG: [ 2550412 ] When conflictfile saved trailing line-ending is lost
Kimmo Varis
BUG: [ 2772646 ] left & right description is the same one Submitted by black hero <black-hero@users.sourceforge.net>
Kimmo Varis
PATCH: [ 2727151 ] "Invalid Argument" Submitted by Matthias Mayer
Kimmo Varis
WinMerge stable release 2.12.2 (SVN revision 6625)
Kimmo Varis
Update version numbers for 2.12.2 stable release.
Kimmo Varis
Docs: Release notes update for 2.12.2 stable release.
Kimmo Varis
PATCH: [ 2720875 ] Polish translation after Q&A Submitted by Skiff
Kimmo Varis
PATCH: [ 2717382 ] Polish Update files for Branch+Trunk Update for installer translation Submitted by M.T <mtrz@users.sourceforge.net>
Kimmo Varis
PATCH: [ 2712120 ] patch for Bug#2622196 Submitted by Matthias Mayer
Kimmo Varis
PATCH: [ 2714968 ] Disable tree-view by default
Kimmo Varis
PATCH: [ 2717382 ] Polish Update files for Branch+Trunk Submitted by M.T <mtrz@users.sourceforge.net>
Kimmo Varis
Manual: Update WinMerge version to 2.12.2.
Kimmo Varis
Docs: Update release notes for 2.12.2 stable release.
104 commits not shown.