Merge branch 'release-0.6.5'
[olsrd.git] / .hgignore
index e46cc0c..339a2d7 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -8,19 +8,20 @@ syntax: glob
 *.swp
 *~
 *.out.*
-*-backup
 TAGS
 olsrd
-config-verify
+olsr_switch
 netsimpcap
 src/builddata.c
+src/cfgparser/oparse.c
+src/cfgparser/oparse.h
+src/cfgparser/oscan.c
 lib/*/*so.*.*
 *.obj
 *.lib
 *.dll
 olsrd.exe
 olsr-setup.exe
-olsrd.exports
 *.opt
 *.ncb
 *.aps
@@ -30,15 +31,3 @@ gui/win32/Main/Debug/
 gui/win32/Main/Release/
 gui/win32/Shim/Debug/
 gui/win32/Shim/Release/
-#*#
-.#*
-*.flc
-redhat/olsrd.spec
-files/index.html
-files/olsrd_8.html
-files/olsrd_conf_5.html
-files/olsr_switch_8.html
-files/olsrd_metrics_3.html
-files/olsrd-history.5
-contrib/txtinfoshell/txtinfo-sh
-