comparison en/examples/tour-merge-conflict @ 534:263a8436d72d

translated more text. Surprise!
author jerojasro@localhost
date Mon, 01 Dec 2008 21:53:26 -0500
parents e281bd9a8e47
children bc14f94e726a
comparison
equal deleted inserted replaced
533:c847605eb2a9 534:263a8436d72d