comparison src/filestates.cpp @ 378:ad2e56d1e4c4

Reset merge-commit comment when merge fails; add missing ampersand from Help menu label
author Chris Cannam
date Tue, 12 Apr 2011 12:21:51 +0100
parents b9c153e00e84
children 653e9694a694
comparison
equal deleted inserted replaced
377:4d13cacb3e65 378:ad2e56d1e4c4