summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorRobert James Kaes <rjkaes@users.sourceforge.net>2004-08-10 21:24:24 +0000
committerRobert James Kaes <rjkaes@users.sourceforge.net>2004-08-10 21:24:24 +0000
commitbadc7673d06257b720444c785efa3fbd3233f69e (patch)
treede8c0078324299a9ca41188bf337e0cfc4adc526 /ChangeLog
parent18df4910a43e8f1b0d9d10df37236fabf0ba8508 (diff)
downloadtinyproxy-badc7673d06257b720444c785efa3fbd3233f69e.tar.gz
tinyproxy-badc7673d06257b720444c785efa3fbd3233f69e.zip
Merged in changes from 1.6.3
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fb0cb9a..379e2ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-10 Robert James Kaes <rjkaes@users.sourceforge.net>
+
+ Merged in changes from 1.6.3.
+
2004-01-26 Robert James Kaes <rjkaes@flarenet.com>
Released tinyproxy 1.7.0 (2004-01-26)