comparison es/tour-merge-conflict.svg @ 493:b286919e0d61

merged changes from Igor
author Javier Rojas <jerojasro@devnull.li>
date Mon, 03 Nov 2008 21:04:25 -0500
parents 04c08ad7e92e
children
comparison
equal deleted inserted replaced
492:2c2c86824c61 493:b286919e0d61