![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@noris.net> | |
| Mon, 14 Jul 2008 07:44:29 +0000 (09:44 +0200) | ||
| committer | Florian Forster <octo@noris.net> | |
| Mon, 14 Jul 2008 07:44:29 +0000 (09:44 +0200) |
Conflicts:
src/ntpd.c
src/ntpd.c
| 1 | 2 | |||
|---|---|---|---|---|
| configure.in | patch | | diff1 | | diff2 | | blob | history |
diff --cc configure.in
Simple merge