view tests/test-merge4.out @ 10654:153dd9139b0e

any is not available for python2.4
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 11 Mar 2010 19:09:35 +0100
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)