view easyhg_en.qm @ 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 45e6b35afc70
children 4811eb34e819
line wrap: on
line source
(binary:application/octet-stream)