From 936e7a94cb6eb6fec5aeeb2438af525981e68794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 12 Jul 2013 14:46:19 -0300 Subject: Fold in changes --- CHANGELOG | 7 ++++++- changes/bug2895_improve_leap_assert | 2 -- changes/consider_osx_tempdirs | 1 - 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 changes/bug2895_improve_leap_assert delete mode 100644 changes/consider_osx_tempdirs diff --git a/CHANGELOG b/CHANGELOG index 5f9cb69..a6918b9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,9 @@ -0.2.2 Jun 28: +0.2.6 Jul 12: + o Improve leap_assert so that it only prints the traceback from the + leap_assert call up. Closes #2895 + o Add OSX temp directories to the basetests class. + +0.2.5 Jun 28: o Bugfix: use the provider's default language as default string. Also take care (and note) a possible case with a problematic provider misconfiguration. Closes #3029. diff --git a/changes/bug2895_improve_leap_assert b/changes/bug2895_improve_leap_assert deleted file mode 100644 index 8caea7e..0000000 --- a/changes/bug2895_improve_leap_assert +++ /dev/null @@ -1,2 +0,0 @@ - o Improve leap_assert so that it only prints the traceback from the - leap_assert call up. Closes #2895 \ No newline at end of file diff --git a/changes/consider_osx_tempdirs b/changes/consider_osx_tempdirs deleted file mode 100644 index 5cc20fb..0000000 --- a/changes/consider_osx_tempdirs +++ /dev/null @@ -1 +0,0 @@ - o Add OSX temp directories to the basetests class. \ No newline at end of file -- cgit v1.2.3