comparison en/tour-merge-conflict.svg @ 508:04ba1c7785ae

Fixing build prevention, goofy translator. Taking a new chapter
author Igor TAmara <igor@tamarapatino.org>
date Sun, 09 Nov 2008 23:50:07 -0500
parents 5b80c922ebdd
children
comparison
equal deleted inserted replaced
507:56914d368af4 508:04ba1c7785ae