2010-06-20 meld-1.3.2
=====================

    * Add keyboard merging support (Kai Willadsen)

    * Add support for bulk change merging (Piotr Piastucki)

    * Add auto-merge with ancestor mode; please note that this can currently
      only be started from the commandline (Piotr Piastucki)

    * Updates to VC support, including lots of git fixes (Peter Tyser and
      others)

    * UI cleanups, including a cleaner Preferences dialog, and message areas
      for most error reporting (Kai Willadsen)

    * Plenty of miscellaneous bug fixes (Didier Roche, Geoffrey Irving,
      Kai Willadsen, Martyn Thomas, Peter Tyser, Piotr Piastucki)

    * Translation updates:
      cs (Petr Kovar), de (Holger Wansing, Mario Blättermann), es (Jorge
      González), fr (Bruno Brouard, Claude Paroz), gl (Enrique Estévez, Fran
      Diéguez), hu (Gabor Kelemen), it (Andrea Zagli), ja (Takeshi AIHANA),
      pt_BR (Djavan Fagundes), sl (Matej Urbančič), sq (Besnik Bleta, Laurent
      Dhima), sr@latin (Danilo Šegan), sv (Daniel Nylander), zh_CN (arccos,
      Careone)


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-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)

2008-11-23 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-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.


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.

2006-06-10 meld-1.1.4
=====================

	* Refresh and reload buttons.

	* Better context menu behaviour for vcview.

	* Allow escaping of shell patterns. (Patch from Jared Sulem)

	* Stop button sensitive only when needed.

	* Added ignore symlinks option for folder comparisons.

	* Various vc and other minor patches.

2006-01-29 meld-1.1.3
=====================

	* Arch support updates (Ali Afshar)

	* Sync scroll works, even with word wrap Bug 326648

	* Use shutil.copy2 so [am]time is copied.
		Suggestion from Eric Firing

	* Monotone support. Patch from Daniel Thompson.

	* Handle -h,-v command line options correctly. Bug 321634

2005-11-08 meld-1.1.2
=====================

	* Add bzr support. Patch from Aaron Bentley.

	* Fix missing file attributes in dirdiff statusbar.

	* Hide pygtk 2.6 -> 2.8 deprecation warnings.

2005-10-26 meld-1.1.1
=====================

	* Now require pygtk-2.6+ and remove deprecation warnings
	  from previous versions. Use new filechooser.

	* New pluggable version control system.

	* New drawing code makes filediff much prettier.

	* Detect resolved cvs conflicts. Bug 308937

2005-10-25 meld-1.1.0
=====================

	* Faulty release removed.

2005-08-12 meld-1.0.1
=====================

	* Translation plural form fixes. Bug 309408.

	* Hide deprecation warnings. Bug 310077.

	* Updated translations.
	  Takeshi AIHANA(jp.po) Miloslav Trmac(cs.po)
	  Dongsu Jang(ko.po) Alexander Shopov(bg.po)
	  Vincent van Adrighem(nl.po)

2005-07-01 meld-1.0.0
=====================

	* Added quick patch viewer via filediff context menu

	* Smarter abbreviation for tab labels.
	
	* Add svn directory hide rule. Bug 306093.

	* Fix inline highlighting for non-ascii encodings. Bug 304988.

	* Fix incorrect conflict detection. Bug 308833.

	* Fix some i18n issues in the source. Thanks to
	  Benoît DEJEAN, Danilo Segan and Christian Rose.

	* Many updated translations since 0.9.6
	  Frank Arnold(de.po) Alexey Rusakov(ru.po)
	  Woodman Tuen(zh_TW.po) Jorge Gonzalez(es.po)
	  Christian Rose(sv.po) Adam Weinberger(en_CA.po)
	  Benoît DEJEAN(fr.po) Alexander Shopov(bg.po)

2005-05-18 meld-0.9.6
=====================

	* Disable dirdiff hiding when tree is being filled. Bug 160211.

	* Remove and disable multiline text filters. Bug 162688.

	* Updated to work with libglade2.4.1

	* Fix svn parse error. Bug 165079.

	* Improve regex matching. Bug 172194.

	* "meld <svn file>" works like cvs. Bug 169986.

	* Fix filediff line crossing. Bug 171788.

	* Fix "ignore blank lines" option breaks merge buttons. Bug 168010.

2004-12-10 meld-0.9.5
=====================

	* New docbook based user guide

	* Can use either pygtksourceview (preferred) or pysourceview
	  Fixed minor issues related to sourceview.

	* Can now compare files with different encodings

	* SVN browser is not confused by unversioned directories

	* SVN browser sorts by filename, not version number.

	* Minor cosmetic fixes and typos in strings fixed

2004-07-15 meld-0.9.4
=====================

	* Regular expression for ignore patterns in file diff.

	* Ignore blank lines option

	* Misc CVS and SVN fixes.

	* Compatibility restored for python2.2

	* Up/Down buttons now work in directory/cvs/svn view.


2004-04-26 meld-0.9.3
=====================

	* Added line numbers and syntax highlighting. (Requires pygtksourceview)

	* Subversion support. (Patch from Adam Muegge).

	* New status bar shows permissions and dates in dirdiff, shows
	  line/column in filediff.

	* Better focus behaviour when switching betweeen tabs.

	* Works with pygtk-2.3.92

2004-02-23 meld-0.9.2.1
=======================

	* Bugfix release to fix broken install

	* Fix float->int conversion warning for python2.3

2004-02-11 meld-0.9.2
=====================

	* Many translations added and updated. Thanks to the gnome translation
	  team. Benoît Dejean (French), Danilo Šegan (Serbian), Duarte Loreto
	  (Portuguese), Miloslav Trmac (Czech), Daniel van Eeden, Kees van den
	  Broek (Dutch), Dongsu Jang (Korean)

	* Differences within a line are now highlighted.

	* Meld can now launch an external editor.

	* CVS console state is remembered.

	* Text search now works for multibyte character sets.

	* Now using bugzilla.gnome.org for bug tracking

	* Added keyboard navigation for directory diffs.

	* Work around some pango/gtk font rendering issues where monospaced fonts
	  are not monospaced vertically. (Most noticibly non breaking spaces)

2003-11-22 meld-0.9.1
=====================

	* i18n support working, french translation added. Thanks to Benoit Dejean.

	* CVS 'all files appear modified' when LANG is set fixed.

	* Fix race condition which could lead to empty CVS patches.

	* Timestamp differences now ignored for directory diff.

	* Fix 'both horizontal' toolbar style. (GNOME changed the spelling)

	* CVS refresh now actually refreshes.

	* Filename filters used to treat *.x as *.x*. Fixed.

	* 'Filter New' button now works.

	* Universal newline support added (python2.3 only)

	* Text now saved with the same codec as it was loaded with.

	* App quit handling has changed to be more friendly.

	* Install and uninstall targets added to makefile.

	* CVS console scroll behaviour is better.

2003-10-12 meld-0.9.0
=====================

	* Completely reworked preferences.

	* Editor for file name filters

	* Editor for regular expression filters

	* New CVS options.

	* Added CVS console.

	* CVS view now uses .cvsignore and has a better Entries parser.

	* Allow long running operations to be interrupted.

2003-08-31 meld-0.8.5
=====================

	* Fix warnings for python2.3

	* Add user definable dirdiff filters. (see manual)

	* CVS Context menu for common ops.

	* CVS Partial tree refreshing.

	* Better parsing of CVS/Entries
	
	* CVS updates status when files are edited.

	* Dirdiff now has case insensitive option.

	* CVS warns if the patch is empty.

	* Fix CVS modification times when UTC != localtime. 
	  Thanks to and Martin Pool (report+patch) and Mike Grant (report)

	* Initial i18n support.

	* Dirdiff speedup by using filecmp instead of homegrown function.
	  Thanks to Benoit Dejean.

2003-07-28 meld-0.8.4
=====================

	* add missing pixmap from 0.8.3 release

	* add search function

2003-07-24 meld-0.8.3
=====================

	* Add margin clicking to directory view.

	* Consider files ending in '~' to be backups. RFE From Beniot Dejean.

	* Added margin diffmap guides

	* Add emblem for newest file in directory view

	* Add copy,cut,paste.

	* Modified files are checked to save by default.

	* Added context menu to save/save as from filediff

	* Add parent to dialogs. Improves window manager interaction.

	* Poup new.. now behaves like normal popups. 

2003-06-21 meld-0.8.2
=====================

	* Added filters for directory view.

	* Added toolbar for directory view.

	* Added icons to notebook tabs.

	* Added coloured folder icons.

	* Fix bugs 746983 and 753815 recursive copy and delete.

	* Escape tree labels to avoid problems with filenames containing '&'

2003-05-19 meld-0.8.1
=====================

	* The interface has been made much more responsive using a new task
	  scheduler based on Python generators and idle callbacks.

	* Directory diff searches for all differences recursively for you.

	* Incremental filediff loader lets you see files as they load.

	* Filediff loader lets you choose the order of codecs tried.

	* Diffs now update as you type instead of after a small delay.

	* CVS browser now usable when the application current directory is not
	  inside the CVS tree.

	* meld 'file' now shows cvs diff without having to open a cvs browser

	* better focus behaviour for filediff.

	* Right click on a tab now brings up a tab menu.

	* Some Gnome HIG dialog alterations.

2003-03-24 meld-0.8.0
=====================

	* Never released.

2003-03-24 meld-0.7.9
=====================

	* Diff update is now incremental; That is updates happen on each 
	  keypress instead of after a short timeout. This makes meld usable
	  on large files with many differences.

	* Much better loading interaction. The text is immediately visible
	  and scrollable - the diffs are computed in an idle callback.

	* CVS browser should now be considered beta not alpha. It works 
	  with any location without needing to run 'meld .'

	* Right click on the tabs now pops up a tab menu.


2003-03-24 meld-0.7.1
=====================

	* Added more colourful filediff.

	* Click in margin scrolls to that point.  (suggestion from Alexander Dreweke)

	* Allow CVS diff for a single file from the command line.

	* Do not refresh filelist when launching diff.

	* Add a fallback font if 'monospace' is not available. (patch from Ross Burton)

	* Better handling of keyboard focus

	* Added version checking to main script.

	* Added --profile option.

2003-03-24 meld-0.7.0
=====================

	* cvsview: Added status, tag, rev, options and location fields.

	* cvsview: Hide location when not in recurse mode.

	* cvsview: Commit messages now work when containing shell metacharaters.

	* filediff: Load files lazily for quicker feedback

	* dirdiff: Added copy/delete/diff context menu.

	* dirdiff: Reworked how dirdiff is presented.

2003-02-14 meld-0.6.6.1
=======================

	* This fixes the bug where meld would fail to start if the toolbar
	  preferences were set to icons only.

2003-02-12 meld-0.6.6
=====================

	* Many updates to preferences.

	* You can now change font and tab size.  Or use the default GNOME monospace font.

	* Toolbar style is now changeable or can follow GNOME default.

2003-01-28 meld-0.6.4
=====================

	* Fix bug where deep directories were not correctly handled

	* Dont refresh cvs view every time we open a diff.

	* Filebrowser focus now switches to next entry when an entry is activated.

	* Allow unnamed buffers ("cut and paste" diffs)

2002-12-14 meld-0.6.3
=====================

	* Meld can now edit non utf8 files by explicitly specifying the encoding.

	* CVS browser now cleans up temporary files correctly.

	* CVS browser shows currently executing actions.

	* CVS browser commit dialog added.

	* Added preferences dialog.

2002-11-26 meld-0.6.2
=====================

	* Add missing pixmaps for directory diff.

	* Set about dialog properties correctly.  

	* Fail if new style pygtk not present. (pygtk.require())

	* Remove #! from non executable files. 

	* Set copyright correctly.

2002-11-12 meld-0.6.1
=====================

	* Added colouring for modified/missing files in dirdiff.

	* Added icons for dirdiff.

	* Added new simple draw style.

2002-11-04 meld-0.6.0
=====================

	* Ask to save modified files on exit.

	* Added settings menu for linkmap drawing style.

	* Added alpha directory differ.

	* Directory and file comparison can dynamically switch from 1,2,3 panes.

	* Toolbar made smaller.

2002-10-01 meld-0.5.4
=====================

	* Make cvsview work when not called from the command line.

	* Fix bug where deletes were not highlighted.  Fix
	  bug where inserts were not clickable.

2002-09-27 meld-0.5.3
=====================

	* Now works with both latest and older pygtk (Ross Burton).

	* HIG patches (Ross Burton).

	* Smarten up notebook labels.

	* Fix bug where deletes were not highlighted.

	* Fix bug where inserts were not clickable.

2002-08-18 meld-0.5.2
=====================

	* diff3 now fully functional (merging buttons etc)
	 
	* new cvs icons. Thanks to Jakub "Jimmac" Steiner for
	  the icons and to Ross Burton for the suggestion.

2002-08-04 meld-0.5.1
=====================

	* Allow for different font sizes.

2002-08-04 meld-0.5
===================

	* No notes.

2002-07-19 meld-0.4
===================

	* Remove test files from release

2002-07-19 meld-0.4
===================

	* Edit files in place. Diffs update dynamically.

	* Middle column shows detailed changes, and allows merges

	* User friendly diff browsing

	* Margins show location of changes

	* Tabbed interface - open many diffs at once

	* Next/prev diff 

	* Unlimited undo

	* Preliminary CVS integration. (meld.py -C)

	* Preliminary diff3 support.

2002-06-14 meld-0.3
===================

	* remove some debugging code

2002-06-12 meld-0.2
===================

	* Added file/save plus accelerators.

	* Allow app to be run from different directory.
	
	* Add groups to undo.  Undo/redo works properly for merging.

	* Added undo/redo for single doc.  Added timeouts for updating diff delay.

	* Added merge buttons.  Added next/prev diff scrolling (mousewheel)

	* Added changed text highlight

	* Move common functionality into a base class

	* Improve performance for diff map of large files.

	* Diffcomponent now has 'files-changed' signal.  Move main
	  to own function to avoid creating globals inadvertently.

	* Add new filediff2 dialog.  Added refresh button.

2002-05-18 meld-0.1
===================

	* Developers test release 1