summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorjcwillia <jcwillia>2007-01-04 16:10:48 +0000
committerjcwillia <jcwillia>2007-01-04 16:10:48 +0000
commitddcf8384772dc240aec64ba816f28c23f2e0fefa (patch)
tree5ba257510355e21e953e7004b8ccd22550d3c682 /ChangeLog
parent467b6734b41f1a01f6f9e6765fdcd72d0deb1adb (diff)
downloadmock-ddcf8384772dc240aec64ba816f28c23f2e0fefa.tar.gz
mock-ddcf8384772dc240aec64ba816f28c23f2e0fefa.tar.xz
mock-ddcf8384772dc240aec64ba816f28c23f2e0fefa.zip
merged mock-0-6-branch fixes into HEADpostmerge_20070104
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a2ba818..de714a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-03 Clark Williams <williams@redhat.com>
+
+ * mock.py, Makefile, etc/*.cfg
+ merged BZ fixes from mock-0.6 branch
+
2006-09-08 Clark Williams <williams@redhat.com>
* mock.c
@@ -118,6 +123,7 @@
* etc/defaults.cfg: use defaults more intelligently
+
2006-05-24 11:15 skvidal
* mock.py, src/mock-helper.c: