Automated merge with http://olsrd.sf.net/hg/olsrd
authorHannes Gredler <hannes@gredler.at>
Fri, 29 Feb 2008 19:12:27 +0000 (20:12 +0100)
committerHannes Gredler <hannes@gredler.at>
Fri, 29 Feb 2008 19:12:27 +0000 (20:12 +0100)
1  2 
.hgignore

diff --cc .hgignore
+++ b/.hgignore
@@@ -5,10 -5,11 +5,12 @@@ syntax: glo
  *.diff
  *.rej
  *.orig
+ *.swp
  *~
+ *.out.*
  TAGS
  olsrd
 +olsr_switch
  src/builddata.c
  src/cfgparser/oparse.c
  src/cfgparser/oparse.h