annotate help/images/merge.png @ 549:06f7ae09015f

Fix error that caused fs watcher to be updated during operations
author Chris Cannam
date Wed, 15 Feb 2012 14:34:35 +0000
parents f56e5c39aad1
children
rev   line source
Chris@531 1 (binary:image/png)