summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xCHANGELOG3
-rw-r--r--CONTRIBUTORS10
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e6bd4eb..284a310 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,7 +24,8 @@
- fix issue126: depend on virtualenv>=1.10.1 so that we can rely
(hopefully) on a pip version which supports --pre. (tox by default
- uses to --pre).
+ uses to --pre). also merged in PR84 so that we now call "virtualenv"
+ directly instead of looking up interpreters. Thanks Ionel Maries Cristian.
- fix issue130: you can now set install_command=easy_install {opts} {packages}
and expect it to work for repeated tox runs (previously it only worked
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9d8784a..a9ac89a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -12,3 +12,13 @@ Lukasz Balcerzak
Philip Thiem
Monty Taylor
Bruno Oliveira
+Ionel Maries Cristian
+Anatoly techntonik
+Matt Jeffery
+Chris Jerdonek
+Ronald Evers
+Carl Meyer
+Anthon van der Neuth
+Matt Good
+Mattieu Agopian
+Asmund Grammeltwedt