diff en/examples/branching.merge.out @ 530:f809de31887a

more translation :D added a term to the glossary
author jerojasro@localhost
date Sun, 30 Nov 2008 18:41:51 -0500
parents 5fc4a45c069f
children
line wrap: on
line diff