author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Sat, 8 Nov 2008 08:01:12 +0000 (09:01 +0100) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Sat, 8 Nov 2008 08:01:12 +0000 (09:01 +0100) |
1 | 2 | |||
---|---|---|---|---|
src/Makefile.am | patch | | diff1 | | diff2 | | blob | history |
src/configfile.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/Makefile.am
Simple merge
diff --cc src/configfile.c
Simple merge