Mercurial > hg > easyhg
diff settingsdialog.h @ 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 | ff0d76dcb3b8 |
children | e67bd8abc3e3 |