comparison README.txt @ 583:e40e3ebe9f2e fswatcher

Merge from default branch
author Chris Cannam
date Mon, 12 Mar 2012 14:58:40 +0000
parents 533519ebc0cb
children ae67ea0af696
comparison
equal deleted inserted replaced
547:9f91d1b2ed51 583:e40e3ebe9f2e
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-2011 Chris Cannam 47 Copyright 2010-2012 Chris Cannam
48 Copyright 2010-2011 Queen Mary, University of London 48 Copyright 2010-2012 Queen Mary, University of London
49 49
50 50
51 51
52 52