[Olsr-cvs] olsrd-current CHANGELOG,1.54,1.55

[Andreas T�nnesen]

Update of /cvsroot/olsrd/olsrd-current
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15928

Modified Files:
	CHANGELOG 
Log Message:
Uuups.. merge warnings has snuck into the changelog

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/CHANGELOG,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** CHANGELOG	21 Dec 2005 14:58:06 -0000	1.54
--- CHANGELOG	4 Jan 2006 09:08:08 -0000	1.55
***************
*** 60,76 ****
  - Fixed crash when changing IPv6 address at run-time
  - Fixed a bug that prevented setting willingness 0 in the configfile
- <<<<<<< CHANGELOG
  - Fixed bad handling of missing command line arguments
- =======
  - Did various updates to prevent assertion when a neighbor
    has changed IP and sends HELLO before its olsrd precess has detected
    the change.
- <<<<<<< CHANGELOG
- >>>>>>> 1.47
- =======
  - Fixed return value check on times(2) calls in the scheduler
  - Fixed bug(s) that could cause crash when an interface was brought
    down while olsrd was running.
- >>>>>>> 1.53
  
  0.4.9 ---------------------------------------------------------------------
--- 60,70 ----