author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Thu, 17 Sep 2009 06:52:56 +0000 (08:52 +0200) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Thu, 17 Sep 2009 06:52:56 +0000 (08:52 +0200) |
1 | 2 | |||
---|---|---|---|---|
configure.in | patch | | diff1 | | diff2 | | blob | history |
contrib/collection3/etc/collection.conf | patch | | diff1 | | diff2 | | blob | history |
src/Makefile.am | patch | | diff1 | | diff2 | | blob | history |
diff --cc configure.in
Simple merge
diff --cc contrib/collection3/etc/collection.conf
Simple merge
diff --cc src/Makefile.am
Simple merge