Mercurial > hg > evolve
changeset 1800:b09ac378f025
merge back with stable
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Fri, 06 May 2016 00:22:54 +0200 |
parents | 5fb7f37b82e6 (current diff) 3460887b6859 (diff) |
children | a4de197218cf |
files | |
diffstat | 4 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore +++ b/.hgignore @@ -12,3 +12,4 @@ ^MANIFEST$ ^docs/tutorials/.*\.rst$ \.ico$ +tests/\.testtimes
--- a/.hgtags +++ b/.hgtags @@ -39,3 +39,4 @@ 44a9dcb3fefcf8281ebe4e359e7dbb637512cf7f 5.2.0 c15d6168412f175568dac89e6ee1cd8434fef906 5.2.1 bd59cc2ee2039c370a0343f683488cde2a106565 5.3.0 +b21ce82e6f7640c2b38506545968650227d67e9b 5.4.0