From: oes <oes@users.sourceforge.net>
Date: Thu, 5 Sep 2002 08:57:47 +0000 (+0000)
Subject: Synced with the stable branch:
X-Git-Tag: v_3_1_archive_branchpoint~178
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=540dc4c1815fc2c90ec56be15bb70aef513b161e

Synced with the stable branch:
    Revision 1.10.2.1  2002/08/21 17:58:05  oes
    Temp kludge to let user and default action file be edited through win32 GUI (FR 592080)
---

diff --git a/src/w32log.h b/src/w32log.h
index dd7bc412..9ef92f9c 100644
--- a/src/w32log.h
+++ b/src/w32log.h
@@ -1,9 +1,9 @@
 #ifndef W32LOG_H_INCLUDED
 #define W32LOG_H_INCLUDED
-#define W32LOG_H_VERSION "$Id: w32log.h,v 1.10 2002/03/26 22:57:10 jongfoster Exp $"
+#define W32LOG_H_VERSION "$Id: w32log.h,v 2.0 2002/06/04 14:34:21 jongfoster Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /cvsroot/ijbswa/current/w32log.h,v $
+ * File        :  $Source: /cvsroot/ijbswa//current/src/w32log.h,v $
  *
  * Purpose     :  Functions for creating and destroying the log window,
  *                ouputting strings, processing messages and so on.
@@ -34,6 +34,9 @@
  *
  * Revisions   :
  *    $Log: w32log.h,v $
+ *    Revision 2.0  2002/06/04 14:34:21  jongfoster
+ *    Moving source files to src/
+ *
  *    Revision 1.10  2002/03/26 22:57:10  jongfoster
  *    Web server name should begin www.
  *
@@ -132,7 +135,8 @@ extern int g_nFontSize;
 
 /* FIXME: this is a kludge */
 
-extern const char * g_actions_file;
+extern const char * g_default_actions_file;
+extern const char * g_user_actions_file;
 extern const char * g_re_filterfile;
 #ifdef FEATURE_TRUST
 extern const char * g_trustfile;