comparison settingsdialog.h @ 37:46260ce88b71

Version 0.5.4. Offer to retry merge directly after failed merge attempt.
author Jari Korhonen <jtkorhonen@gmail.com>
date Sat, 19 Jun 2010 13:10:06 +0300
parents 45bfb8dc1faf
children f583e44d9d31
comparison
equal deleted inserted replaced
36:5986d0758069 37:46260ce88b71