OSDN Git Service
Kimmo Varis [Wed, 31 Jan 2007 22:04:42 +0000 (22:04 +0000)]
PATCH: [
1648182 ] Separate Compare options from DiffWrapper
Jochen Tucht [Sun, 28 Jan 2007 13:12:42 +0000 (13:12 +0000)]
Jochen Tucht [Sun, 28 Jan 2007 13:01:45 +0000 (13:01 +0000)]
Support 7z443, 444
Jochen Tucht [Sun, 28 Jan 2007 12:58:48 +0000 (12:58 +0000)]
DllBuild 0019
Takashi Sawanaka [Sun, 28 Jan 2007 02:42:36 +0000 (02:42 +0000)]
PATCH: [
1640741 ] patch for BUG:[
1635100 ] Inefficient word-wrap code
Takashi Sawanaka [Sat, 27 Jan 2007 10:01:27 +0000 (10:01 +0000)]
PATCH: [
1644668 ] Fix ANSI regexps(2)
Kimmo Varis [Fri, 26 Jan 2007 14:59:50 +0000 (14:59 +0000)]
PATCH: [
1644820 ] Implement post-compare linefilters for folder compare
Kimmo Varis [Fri, 26 Jan 2007 14:56:58 +0000 (14:56 +0000)]
PATCH: [
1644668 ] Fix ANSI regexps
Tim Gerundt [Thu, 25 Jan 2007 22:48:05 +0000 (22:48 +0000)]
PATCH: [
1644800 ] 24bit "Goto" icon
Tim Gerundt [Thu, 25 Jan 2007 22:46:13 +0000 (22:46 +0000)]
PATCH: [
1644785 ] 24bit icons for "Window" menu
Tim Gerundt [Wed, 24 Jan 2007 21:44:13 +0000 (21:44 +0000)]
PATCH: [
1637155 ] Web: Move "Support" to own tab
Kimmo Varis [Wed, 24 Jan 2007 18:41:49 +0000 (18:41 +0000)]
PATCH: [
1642809 ] Move compare code out from DiffFileData
Kimmo Varis [Mon, 22 Jan 2007 17:34:50 +0000 (17:34 +0000)]
PATCH: [
1607375 ] Move runtime files to separate folder in trunk
Tim Gerundt [Sun, 21 Jan 2007 20:08:29 +0000 (20:08 +0000)]
PATCH: [
1630335 ] Web: Update features list in main page
Tim Gerundt [Sun, 21 Jan 2007 19:13:58 +0000 (19:13 +0000)]
PATCH: [
1640934 ] Web: Centralize "This is an old version" info
Kimmo Varis [Sat, 20 Jan 2007 11:37:40 +0000 (11:37 +0000)]
2007-01-20 Kimmo Varis <kimmov@winmerge.org>
* scew/error.c: Fix compile with VS2005
Tim Gerundt [Thu, 18 Jan 2007 22:52:23 +0000 (22:52 +0000)]
PATCH: [
1638998 ] Web: Changes for new stable release 2.6.4
Kimmo Varis [Thu, 18 Jan 2007 18:35:26 +0000 (18:35 +0000)]
BUG: [
1637433 ] Forget selected filter after close
Tim Gerundt [Tue, 16 Jan 2007 22:37:11 +0000 (22:37 +0000)]
With a "min-width" scales the HTML version much better on modern browser with large font sizes.
Tim Gerundt [Tue, 16 Jan 2007 20:27:46 +0000 (20:27 +0000)]
PATCH: [
1637088 ] Manual: Add VB requirements to available plugins
Kimmo Varis [Tue, 16 Jan 2007 20:22:32 +0000 (20:22 +0000)]
Move options function call out of if() (for easier debugging)
Kimmo Varis [Tue, 16 Jan 2007 20:13:21 +0000 (20:13 +0000)]
PATCH: [
1636314 ] Fix limiting to single file compare window
Tim Gerundt [Tue, 16 Jan 2007 19:42:12 +0000 (19:42 +0000)]
PATCH: [
1636315 ] Manual: Nicer navigation layout for HTML version
Kimmo Varis [Mon, 15 Jan 2007 22:05:22 +0000 (22:05 +0000)]
PATCH: [
1634968 ] Swedish translation update for 2.7.1.5+
- Submitted by Hans Eriksson
Tim Gerundt [Mon, 15 Jan 2007 22:01:39 +0000 (22:01 +0000)]
Fix CVS "Id:" line filter.
Kimmo Varis [Mon, 15 Jan 2007 22:00:04 +0000 (22:00 +0000)]
PATCH: [
1414233 ] Template ExternalArchiveFormat.ini
- Submitted by Perry
Kimmo Varis [Mon, 15 Jan 2007 20:46:46 +0000 (20:46 +0000)]
Add René Leonhardt to Contributors.txt
Kimmo Varis [Mon, 15 Jan 2007 20:40:36 +0000 (20:40 +0000)]
PATCH: [
1620076 ] Add Bazaar and Mercurial to SourceControl.flt
- Submitted by René Leonhardt
Kimmo Varis [Sun, 14 Jan 2007 21:59:20 +0000 (21:59 +0000)]
PATCH: [
1633581 ] Restrict expanding env variables in open dialog
Kimmo Varis [Sun, 14 Jan 2007 21:06:39 +0000 (21:06 +0000)]
PATCH: [
1633560 ] Manual: WinMerge minimizes time needed for ignored files
Tim Gerundt [Sun, 14 Jan 2007 20:13:33 +0000 (20:13 +0000)]
PATCH: [
1633632 ] Plugin to ignore leading line numbers in text files
Tim Gerundt [Sun, 14 Jan 2007 19:41:44 +0000 (19:41 +0000)]
PATCH: [
1633944 ] Fix VB example plugin "IgnoreTwoFirstCharsOrder"
Kimmo Varis [Sun, 14 Jan 2007 19:40:42 +0000 (19:40 +0000)]
Update manual URL point to 2.6 version manual in readme.txt
Tim Gerundt [Sat, 13 Jan 2007 14:32:27 +0000 (14:32 +0000)]
The file "Plugins.txt" is unnecessary after patch #
1627363 and #
1630397
Gal Hammer [Thu, 11 Jan 2007 13:51:19 +0000 (13:51 +0000)]
PATCH: [
1633194 ] Add editor tab setting to configuration log
Kimmo Varis [Wed, 10 Jan 2007 17:57:24 +0000 (17:57 +0000)]
WinMerge experimental release 2.7.1.5 (SVN revision 4030)
Kimmo Varis [Wed, 10 Jan 2007 17:02:31 +0000 (17:02 +0000)]
Bump manual revision to 1.3.3, expand copyright to 2007.
Kimmo Varis [Wed, 10 Jan 2007 16:54:44 +0000 (16:54 +0000)]
PATCH: [
1631806 ] Fix Filterspath initialization
Kimmo Varis [Wed, 10 Jan 2007 16:40:49 +0000 (16:40 +0000)]
PATCH: [
1631796 ] Use PCRE for filemask filtering
Takashi Sawanaka [Wed, 10 Jan 2007 15:10:02 +0000 (15:10 +0000)]
BUG: [
1631613 ] WinMerge crashes when editing code files
Takashi Sawanaka [Wed, 10 Jan 2007 14:12:58 +0000 (14:12 +0000)]
BUG: [
1630630 ] Unexpected selection of text after changing pane
Gal Hammer [Wed, 10 Jan 2007 13:49:00 +0000 (13:49 +0000)]
PATCH: [
1597814 ] 'Wrap Lines' + 'Next Diff' Bug (3)
Gal Hammer [Wed, 10 Jan 2007 13:46:26 +0000 (13:46 +0000)]
PATCH: [
1631215 ] Remove used files
Kimmo Varis [Mon, 8 Jan 2007 20:48:23 +0000 (20:48 +0000)]
PATCH: [
1593810 ] Line-filtering post compare
Tim Gerundt [Mon, 8 Jan 2007 20:24:20 +0000 (20:24 +0000)]
PATCH: [
1630397 ] Remove "Plugins.txt" from installer
Gal Hammer [Mon, 8 Jan 2007 15:16:24 +0000 (15:16 +0000)]
BUG: [
1597939 ] Rename Edits Wrong Field in Folder Compare List
Kimmo Varis [Sun, 7 Jan 2007 11:38:29 +0000 (11:38 +0000)]
BUG: [
1567749 ] "Unable to compare files" needs short result
Kimmo Varis [Sat, 6 Jan 2007 18:22:03 +0000 (18:22 +0000)]
ConvertFilter() function in FileOrFolderSelect can be a static function
Kimmo Varis [Sat, 6 Jan 2007 17:02:54 +0000 (17:02 +0000)]
PATCH: [
1567773 ] Change "Only in xxxxxxxxxx" to "Right Only: xxxxxxxxxx"
Kimmo Varis [Sat, 6 Jan 2007 12:17:15 +0000 (12:17 +0000)]
TODO: [
1485038 ] Rename DIFFITEM::IsSideLeft() and IsSideRight()
Kimmo Varis [Sat, 6 Jan 2007 10:12:56 +0000 (10:12 +0000)]
TODO: [
1489875 ] Mimimum height for location pane visible area indicator
Kimmo Varis [Fri, 5 Jan 2007 21:09:36 +0000 (21:09 +0000)]
PATCH: [
1628263 ] Add debug-menuitem for resetting options
Kimmo Varis [Fri, 5 Jan 2007 18:45:20 +0000 (18:45 +0000)]
PATCH: [
1628299 ] Use OptionsMgr for archive options
Kimmo Varis [Fri, 5 Jan 2007 18:41:41 +0000 (18:41 +0000)]
PATCH: [
1628203 ] Reduce options caching in MergeEditView
Tim Gerundt [Thu, 4 Jan 2007 21:23:36 +0000 (21:23 +0000)]
[
1627363 ] Manual: Merge with Plugins.txt and list_of_sources.txt
Kimmo Varis [Thu, 4 Jan 2007 21:03:30 +0000 (21:03 +0000)]
Use Empty() method for CString instead of assigning empty string into it
Tim Gerundt [Thu, 4 Jan 2007 20:38:29 +0000 (20:38 +0000)]
PATCH: [
1626464 ] Manual: Highlight examples with CSS
Kimmo Varis [Thu, 4 Jan 2007 16:40:13 +0000 (16:40 +0000)]
PATCH: [
1625344 ] Move OptionsMgr from MainFrame to MergeApp
Tim Gerundt [Tue, 2 Jan 2007 11:17:54 +0000 (11:17 +0000)]
PATCH: [
1624906 ] Manual: Add registered trademark for Microsoft
Tim Gerundt [Tue, 2 Jan 2007 11:12:25 +0000 (11:12 +0000)]
PATCH: [
1624905 ] Manual: Remove <productname>
Kimmo Varis [Sun, 31 Dec 2006 11:42:28 +0000 (11:42 +0000)]
PATCH: [
1625022 ] Constify OptionsManager parameters
Kimmo Varis [Sat, 30 Dec 2006 17:51:34 +0000 (17:51 +0000)]
PATCH: [
1623772 ] Constify PathContext parameter strings
Tim Gerundt [Sat, 30 Dec 2006 12:38:41 +0000 (12:38 +0000)]
PATCH: [
1623604 ] Manual: Remove <screen> from Command_line.xml
Tim Gerundt [Fri, 22 Dec 2006 23:40:37 +0000 (23:40 +0000)]
Fix two invalid links.
Tim Gerundt [Fri, 22 Dec 2006 22:58:35 +0000 (22:58 +0000)]
Refresh sitemap file.
Tim Gerundt [Thu, 21 Dec 2006 23:39:46 +0000 (23:39 +0000)]
Optimize "head" a little bit more for large font sizes in Firefox.
Kimmo Varis [Thu, 21 Dec 2006 09:06:40 +0000 (09:06 +0000)]
WinMerge experimental release 2.7.1.4 (SVN revision 3991)
Takashi Sawanaka [Wed, 20 Dec 2006 22:55:04 +0000 (22:55 +0000)]
BUG: [
1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
Kimmo Varis [Wed, 20 Dec 2006 20:22:51 +0000 (20:22 +0000)]
BUG: [
1619689 ] Filefilter: ASP.NET Devel
Kimmo Varis [Wed, 20 Dec 2006 18:17:28 +0000 (18:17 +0000)]
Bump ShellExtension version to 1.10
Kimmo Varis [Wed, 20 Dec 2006 18:14:15 +0000 (18:14 +0000)]
Bump manual revision to 1.3.2
Kimmo Varis [Wed, 20 Dec 2006 17:51:23 +0000 (17:51 +0000)]
BUG: [
1606583 ] VC6 build is broken
- Backout of patch [
1603769 ] Send MergeCmdLineInfo between instances
Kimmo Varis [Wed, 20 Dec 2006 14:42:21 +0000 (14:42 +0000)]
PATCH: [
1618935 ] Manual: Add screenshots and description for editor margin
Kimmo Varis [Wed, 20 Dec 2006 14:30:18 +0000 (14:30 +0000)]
PATCH: [
1618452 ] Manual: Add new FAQ item about all lines marked different
Tim Gerundt [Tue, 19 Dec 2006 21:10:11 +0000 (21:10 +0000)]
PATCH: [
1618444 ] Web: Add miscellaneous links
Kimmo Varis [Tue, 19 Dec 2006 14:02:49 +0000 (14:02 +0000)]
PATCH: [
1618364 ] Make GPL URL const string
Kimmo Varis [Tue, 19 Dec 2006 14:00:24 +0000 (14:00 +0000)]
PATCH: [
1618358 ] Fix warning about non-standard extension with enum
Tim Gerundt [Mon, 18 Dec 2006 21:07:47 +0000 (21:07 +0000)]
PATCH [
1618320 ] Update Slovak translation status and add new translator
Kimmo Varis [Mon, 18 Dec 2006 19:56:35 +0000 (19:56 +0000)]
SCEW files use UNIX line endings, my previous commit converted scew.h to use DOS line endings. This commit converts scew.h back to UNIX line endings.
Kimmo Varis [Mon, 18 Dec 2006 19:49:09 +0000 (19:49 +0000)]
PATCH: [
1616302 ] Small BUILD bug, in scew.h, for WIN32
Kimmo Varis [Mon, 18 Dec 2006 18:57:59 +0000 (18:57 +0000)]
PATCH: [
1617502 ] Cleanup use of enum in MovedLines
Tim Gerundt [Sun, 17 Dec 2006 22:33:59 +0000 (22:33 +0000)]
PATCH: [
1617585 ] Web: Rename all.css to screen.css
Tim Gerundt [Sun, 17 Dec 2006 22:07:27 +0000 (22:07 +0000)]
PATCH: [
1617578 ] Web: Move tabs code to own function
Tim Gerundt [Sun, 17 Dec 2006 21:34:34 +0000 (21:34 +0000)]
PATCH: [
1617527 ] Web: Add min-width to body
Tim Gerundt [Sun, 17 Dec 2006 21:28:36 +0000 (21:28 +0000)]
PATCH: [
1617518 ] Web: Remove "main" <div>
Gal Hammer [Sun, 17 Dec 2006 06:43:34 +0000 (06:43 +0000)]
BUG: [
1614558 ] Goto line doesn't work when word wrap is enabled
Tim Gerundt [Thu, 14 Dec 2006 23:14:10 +0000 (23:14 +0000)]
[
1616076 ] Web: Changes for new stable release 2.6.2
Tim Gerundt [Thu, 14 Dec 2006 22:33:52 +0000 (22:33 +0000)]
Ok, Perry is finally gone! :-(
Tim Gerundt [Thu, 14 Dec 2006 22:26:42 +0000 (22:26 +0000)]
PATCH: [
1615375 ] Web: Minimize banner problems
Kimmo Varis [Thu, 14 Dec 2006 13:22:11 +0000 (13:22 +0000)]
BUG: [
1602219 ] Crappy save of project files
Kimmo Varis [Wed, 13 Dec 2006 08:42:37 +0000 (08:42 +0000)]
PATCH: [
1614056 ] Add new SourceControl filter to installer
Kimmo Varis [Wed, 13 Dec 2006 08:17:21 +0000 (08:17 +0000)]
PATCH: [
1614442 ] Swedish translation update for WinMerge 2.6.2
- Submitted by Hans Eriksson
Gal Hammer [Wed, 13 Dec 2006 07:17:17 +0000 (07:17 +0000)]
BUG: [
1584068 ] location pane is inaccurate when word wrap is on (2)
Tim Gerundt [Tue, 12 Dec 2006 20:26:47 +0000 (20:26 +0000)]
The file "readme_users.txt" is unnecessary after patch #
1611595
Kimmo Varis [Mon, 11 Dec 2006 22:30:16 +0000 (22:30 +0000)]
PATCH: [
1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
Kimmo Varis [Mon, 11 Dec 2006 22:27:30 +0000 (22:27 +0000)]
PATCH: [
1610998 ] Splash screen does not stop timer
Kimmo Varis [Mon, 11 Dec 2006 22:18:50 +0000 (22:18 +0000)]
Fix error in logical condition for checking if item is directory
Tim Gerundt [Mon, 11 Dec 2006 21:08:03 +0000 (21:08 +0000)]
PATCH: [
1612824 ] Manual: Use italic text for GUI elements
Tim Gerundt [Mon, 11 Dec 2006 21:00:13 +0000 (21:00 +0000)]
PATCH: [
1611595 ] Manual: Merge Plugins.xml with readme_users.txt
Takashi Sawanaka [Sun, 10 Dec 2006 15:04:33 +0000 (15:04 +0000)]
PATCH: [
1447744 ] Match lines inside diff blocks (based on Perry's patch)