tests/test-merge4.out
author Wagner Bruna <wbruna@softwareexpress.com.br>
Wed, 31 Mar 2010 12:15:24 -0300
changeset 10804 7258da493fe7
parent 6336 4b0c9c674707
permissions -rw-r--r--
merge with i18n stable

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)