| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 6 Nov 2010 08:40:05 +0000 (09:40 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 6 Nov 2010 08:40:05 +0000 (09:40 +0100) |
| 1 | 2 | |||
|---|---|---|---|---|
| configure.in | patch | | diff1 | | diff2 | | blob | history |
| src/Makefile.am | patch | | diff1 | | diff2 | | blob | history |
| src/types.db | patch | | diff1 | | diff2 | | blob | history |
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/types.db
Simple merge