httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: httpd-2.0 CHANGES
Date Fri, 22 Nov 2002 12:41:40 GMT
minfrin     2002/11/22 04:41:40

  Modified:    .        CHANGES
  Log:
  All hail the conflict.
  
  Revision  Changes    Path
  1.991     +0 -1      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.990
  retrieving revision 1.991
  diff -u -r1.990 -r1.991
  --- CHANGES	22 Nov 2002 12:40:48 -0000	1.990
  +++ CHANGES	22 Nov 2002 12:41:40 -0000	1.991
  @@ -22,7 +22,6 @@
        the else path (using the default expiration) if date is
        equal to lastmod. [rx@armstrike.com (Sergey), Paul J. Reder]
   
  ->>>>>>> 1.989
     *) Use AP_DECLARE in the debug versions of ap_strXXX in case the
        default calling convention is not the same as the one used by
        AP_DECLARE.  [Juan Rivera <Juan.Rivera@citrix.com>]
  
  
  

Mime
View raw message