![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 8 Nov 2008 07:59:17 +0000 (08:59 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 8 Nov 2008 07:59:17 +0000 (08:59 +0100) |
| 1 | 2 | |||
|---|---|---|---|---|
| ChangeLog | patch | | diff1 | | diff2 | | blob | history |
| configure.in | patch | | diff1 | | diff2 | | blob | history |
| src/apcups.c | patch | | diff1 | | diff2 | | blob | history |
| src/configfile.c | patch | | diff1 | | diff2 | | blob | history |
| src/mysql.c | patch | | diff1 | | diff2 | | blob | history |
| src/utils_dns.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc ChangeLog
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/apcups.c
Simple merge
diff --cc src/configfile.c
Simple merge
diff --cc src/mysql.c
Simple merge
diff --cc src/utils_dns.c
Simple merge