![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Mon, 15 Mar 2010 21:43:00 +0000 (22:43 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Mon, 15 Mar 2010 21:43:00 +0000 (22:43 +0100) |
| 1 | 2 | |||
|---|---|---|---|---|
| configure.in | patch | | diff1 | | diff2 | | blob | history |
| src/common.c | patch | | diff1 | | diff2 | | blob | history |
| src/common.h | patch | | diff1 | | diff2 | | blob | history |
| src/configfile.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc configure.in
Simple merge
diff --cc src/common.c
Simple merge
diff --cc src/common.h
Simple merge
diff --cc src/configfile.c
Simple merge