view tests/test-merge2.out @ 12228:3ccd5b999500 stable

i18n: merge with stable
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Thu, 26 Aug 2010 22:27:20 -0300
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head