diff easyhg.qrc @ 294:fc9d411ff6e7

Fix some breakages from prior merge commit (oops); make merge result use more-information dialog
author Chris Cannam
date Mon, 21 Feb 2011 18:20:29 +0000
parents 2afac743acdf
children ef31a55c86b6
line wrap: on
line diff