![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Fri, 17 Apr 2009 23:06:23 +0000 (01:06 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Fri, 17 Apr 2009 23:06:23 +0000 (01:06 +0200) |
Conflicts:
src/mysql.c
src/ping.c
src/mysql.c
src/ping.c
| 1 | 2 | |||
|---|---|---|---|---|
| src/mysql.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/mysql.c
index a129f40fab18ba8a6f47f8b69b56dc1010b5167e,cd1ff9d39452fd788a610b1736ac749b51cc4276..ca5c525dcd8d1b0c2c47def7ef0fa6a1120d05ac
--- 1/src/mysql.c
--- 2/src/mysql.c
+++ b/src/mysql.c
/**
* collectd - src/mysql.c
- * Copyright (C) 2006–2008 Florian octo Forster
+ * Copyright (C) 2006-2009 Florian octo Forster
- * Copyright (C) 2009 Doug MacEachern
- * Copyright (C) 2009 Sebastian tokkee Harl
+ * Copyright (C) 2008 Mirko Buffoni
++ * Copyright (C) 2009 Doug MacEachern
++ * Copyright (C) 2009 Sebastian tokkee Harl
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the