comparison README.txt @ 647:a03264984ef8

Merge
author Chris Cannam
date Mon, 21 Jan 2013 10:22:44 +0000
parents ae67ea0af696
children bbf4696f65e3
comparison
equal deleted inserted replaced
646:6653fc50a546 647:a03264984ef8
42 Finally, an external diff/merge utility is required, typically kdiff3. 42 Finally, an external diff/merge utility is required, typically kdiff3.
43 43
44 44
45 EasyMercurial is 45 EasyMercurial is
46 Copyright 2010 Jari Korhonen 46 Copyright 2010 Jari Korhonen
47 Copyright 2010-2012 Chris Cannam 47 Copyright 2010-2013 Chris Cannam
48 Copyright 2010-2012 Queen Mary, University of London 48 Copyright 2010-2013 Queen Mary, University of London
49 49
50 50
51 51
52 52