annotate images/status.png @ 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 a9098eba2ee5
children
rev   line source
jtkorhonen@0 1 (binary:image/png)