Code

Merge branch 'ar/lpar'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 08:40:05 +0000 (09:40 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 08:40:05 +0000 (09:40 +0100)
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