merge default into stable stable
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Thu, 05 May 2016 22:13:02 +0200
branchstable
changeset 1695 77df6101d3b5
parent 1674 854421a48e0c (diff)
parent 1694 5fb7f37b82e6 (current diff)
child 1696 898dfca94433
child 1701 4f3601b12c74
merge default into stable Mercurial 3.8 have been release, let's get ready for a 5.4.0 release.
.hgignore
--- a/.hgignore	Thu May 05 21:54:26 2016 +0200
+++ b/.hgignore	Thu May 05 22:13:02 2016 +0200
@@ -12,3 +12,4 @@
 ^MANIFEST$
 ^docs/tutorials/.*\.rst$
 \.ico$
+tests/\.testtimes