[naviserver-commits] naviserver ChangeLog,1.109,1.110

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/naviserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8081

Modified Files:
	ChangeLog 
Log Message:
got rid of another compiler warning


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** ChangeLog	11 Jun 2005 20:00:47 -0000	1.109
--- ChangeLog	11 Jun 2005 20:04:11 -0000	1.110
***************
*** 1,2 ****
--- 1,6 ----
+ 2005-06-11  Vlad Seryakov  <ser...@us...>
+ 
+ 	nsd/return.c: made warning go away about parentheses around && and ||
+ 
  2005-06-11  Stephen Deasey  <sd...@us...>
  
***************
*** 9,12 ****
--- 13,17 ----
  	* nsd/nslog.c: Say NULL rather than 0 when talking about null pointers.
  
+ >>>>>>> 1.109
  2005-06-11  Zoran Vasiljevic  <vas...@us...>