summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2011-04-28 18:29:31 +0200
committerholger krekel <holger@merlinux.eu>2011-04-28 18:29:31 +0200
commitd38ad5ab8699eae602b9fd493652d122a46874ed (patch)
tree70e19059d98d0cb407b1c133b802cfc25e48ce16
parent574acb2bb45f5e5612953027a38e332052d36c5a (diff)
downloadtox-d38ad5ab8699eae602b9fd493652d122a46874ed.tar.gz
fix the CHANGELOG which i broke during my last merge of Chris Rose changes
-rw-r--r--CHANGELOG.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 13f19e9..c8ab406 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,7 +2,8 @@
-----------------
- require virtualenv-1.5.1 as to make pypy-1.4 work
-- fix issue14: report errors related to test command
+- fix issue22: use virtualenv-1.6, obsoleting virtualenv5 (thanks Jannis Leidel)
+- fix issue14: inline report errors related to test command
- fix issue20: document format of URLs for specifying dependencies
- fix issue19: substitute Hudson for Jenkins everywhere following the renaming
of the project. NOTE: if you used the special [tox:jenkins]