comparison hgexplorer.ico @ 228:b286f26561c9

* Restore a change that got lost in the merge. I think I need to review the external merge tool mechanism here
author Chris Cannam
date Thu, 06 Jan 2011 12:22:56 +0000
parents a9098eba2ee5
children
comparison
equal deleted inserted replaced
227:5d8a5ce96163 228:b286f26561c9