view tests/test-merge4.out @ 11075:4b8fd86aba5e

merge with i18n stable
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Fri, 30 Apr 2010 17:41:09 -0300
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)