comparison settingsdialog.h @ 328:ea62eb083ed4 filelist_right_button_menu

Merge fixes: primarily, handle failed merges better
author Chris Cannam
date Fri, 11 Mar 2011 18:08:22 +0000
parents cc95394e2392
children
comparison
equal deleted inserted replaced
327:f166f70c64f9 328:ea62eb083ed4