Commit graph

10 commits

Author SHA1 Message Date
wiz
4b4c4e6e90 Update to 1.3.3:
2010-09-09 meld-1.3.3
=====================

    * Highlight currently focused change (Kai Willadsen)

    * Add ability to check if version control repos are valid (Peter Tyser)

    * Support multiple-file undo/redo operations after save (Kai Willadsen)

    * Performance improvements, bug fixes and sundry contributions
      (Piotr Piastucki, Alexander Smishlajev, Robert Wahler, Kai Willadsen)

    * Translation updates:
      de (Mario Blättermann), es (Jorge González), fr (Bruno Brouard),
      ja (Takeshi AIHANA), sl (Matej Urbančič), zh_CN (Tao Wang)
2010-09-13 12:33:17 +00:00
drochner
afc07daa40 update to 1.3.2
changes:
-Add keyboard merging, bulk change merging, auto-merge with ancestor mode
-Updates to VC support, including lots of git fixes
-UI cleanups
-bug fixes
-Translation updates
2010-08-09 11:33:53 +00:00
wiz
eb543f6c9e Update to 1.3.1:
2009-08-14 meld-1.3.1
=====================

	* Add svk support (Vincent Legoll)

	* Add support for marking conflicts as resolved (Matthijs van de Water,
	  Vincent Legoll)

	* Warp the text cursor to the start of jumped-to diff chunks (Vincent
	  Legoll)

	* Allow toggling of toolbar and statusbar visibility, and add a fullscreen
	  option (Michael Budde, Stephen Kennedy, Kai Willadsen)

	* Improved change merging and conflict resolution (Piotr Piastucki)

	* Speed up file comparisons and highlighting, significantly improving
	  interactive editing performance (Kai Willadsen, Piotr Piastucki)

	* Meld has a shiny new application icon (Josef Vybíral)
2009-08-21 08:30:30 +00:00
wiz
c2b8d154c4 Update to 1.3.0:
2009-04-17 meld-1.3.0
=====================

        * Minimum requirements are pygobject 2.8 and python 2.4

        * Find dialog replaced with find bar with replace functionality

        * Remove gnome dependencies (Kai Willadsen, Vincent Legoll)
          Meld now runs on win32 (experimental).

        * Many ui tweaks and cleanups (Kai Willadsen, Vincent Legoll)

        * Support for multiple sourceview versions (Vincent Legoll)

        * Updated version control support
            * Multiple VCs in a single directory (Vincent Legoll)
            * Subversion 1.6.x (Vincent Legoll)
            * Add RCS support (Oliver Gerlich, Vincent Legoll)
            * Add Codeville support (Vincent Legoll)
2009-04-20 10:53:58 +00:00
ahoka
cf3163aa63 Remove the bogus requirement for python25, fix the offending line instead. 2009-01-18 12:31:07 +00:00
wiz
7db5f1fc63 Update to 1.2.1. Fix locale file installation.
2008-xx-xx (sic!) meld-1.2.1
============================

	* Pygtk version 2.8 now required
	* Port to gtk.UIManager (Kai Willadsen)
	* Handle spaces in svn paths (Neil Mayhew)
	* Command-line auto-compare all option on startup (Ondrej Novy)
	* Command-line can launch several comparisons (Brian Holmes)
	* Several UI tweaks (better focus behavior, better defaults)
2008-11-24 14:03:56 +00:00
abs
c4b7d04104 update meld to 1.2nb1:
Remove part of patch-aa so the installdir for help/fr/GNUmakefile is
still created.
2008-07-21 07:53:13 +00:00
wiz
543b71396f Update to 1.2:
2008-06-26 meld-1.2
=======================

	* Improve tab rendering (Kai Willadsen)

	* Speedup folder comparison massively for large directories.

	* Fix crasher i18n bug (Kai Willadsen)

	* UI tweaks and cleanups (Tom Baugis, Kai Willadsen)

	* Cleanup vc library redundancy (Vincent Legoll)

	* Various version control fixes.
2008-07-18 09:43:57 +00:00
obache
e137b2d196 Update meld to 1.1.5.1.
Patch provided by Dieter Roelants in PR 36488.

2007-06-12 meld-1.1.5.1
=======================

	* Do not ship .svn folders in tarball

2007-06-09 meld-1.1.5
=====================

	* Handle new version contol command line arguments.

	* CLI option to set the tab labels. Bug 138860.

	* Improve mime type detection from Tomasz Bury. Bug 156137.

	* Hold shift when scrolling to scroll the panes independently.

	* File & folder history now saved from Sam Jacobson.

	* Several small ui improvements.
2007-06-16 02:35:08 +00:00
wiz
220b641053 Initial import of meld-1.1.4:
Meld is a visual diff and merge tool. You can compare two or three
files and edit them in place (diffs update dynamically). You can
compare two or three folders and launch file comparisons. You can
browse and view a working copy from popular version control systems
such such as CVS, Subversion, Bazaar-ng and Mercurial.
2006-07-17 22:41:46 +00:00