From: hal9 <hal9@users.sourceforge.net>
Date: Wed, 24 Apr 2002 03:33:45 +0000 (+0000)
Subject: Catch up with the major stuff.
X-Git-Tag: v_3_0_branchpoint~240
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@/faq/%22https:/@proxy-info-url@?a=commitdiff_plain;h=15036114ec47da24adb7a59ed1bab5a346d85e0f;p=privoxy.git

Catch up with the major stuff.
---

diff --git a/ChangeLog b/ChangeLog
index b14964ef..f0d7d1ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,16 @@
 --------------------------------------------------------------------
 ChangeLog for Privoxy
 --------------------------------------------------------------------
+*** Current CVS *** 
+
+- Actions files are changed to: default.action, standard.action, and 
+  user.action. user.action is for personal/local configuration.
+- Major overhaul of the CGI editor.
+- Multiple actions files can now be specified in config.
+
+
 *** Version 2.9.14 Beta *** 
+
 - Fix Solaris compile problem (gateway.h and filters.h)
 - Makefile fixes for Solaris, FreeBSD (?)
 - Fix build failure where certain features were disabled.