Code

Merge branch 'ff/olsrd'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 22 May 2009 16:02:27 +0000 (18:02 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 22 May 2009 16:02:27 +0000 (18:02 +0200)
1  2 
configure.in
src/Makefile.am
src/types.db

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/types.db
Simple merge