![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Mon, 7 Feb 2011 07:46:04 +0000 (08:46 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Mon, 7 Feb 2011 07:46:04 +0000 (08:46 +0100) |
| 1 | 2 | |||
|---|---|---|---|---|
| src/collectd.conf.pod | patch | | diff1 | | diff2 | | blob | history |
| src/modbus.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/modbus.c
index cad4b2cf4dd01b7b1a4e5352608823f24dfdf88d,a14ccedb291433d3ea9b76391f7e1b8f1e249c55..19848b0b330c056b71a82b92888631c0f1b59830
--- 1/src/modbus.c
--- 2/src/modbus.c
+++ b/src/modbus.c
/**
* collectd - src/modbus.c
- * Copyright (C) 2010 noris network AG
+ * Copyright (C) 2010,2011 noris network AG
*
* 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
- * Free Software Foundation; only version 2 of the License is applicable.
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; only version 2.1 of the License is
+ * applicable.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of