diff options
| author | Andris Mednis <Andris.Mednis@zabbix.com> | 2015-01-15 14:04:34 +0300 |
|---|---|---|
| committer | Andris Mednis <Andris.Mednis@zabbix.com> | 2015-01-15 14:04:34 +0300 |
| commit | ea92bd90364e97ab04e0bfa1755d579184d059f1 (patch) | |
| tree | e518f54a9e8765098745efe5b64456d5b67e84b4 /src/zabbix_agent/listener.c | |
| parent | 7894d590a6445a7901832cdf8ebe55e5aa33e0db (diff) | |
| parent | f9c012f225b28d338026f61a81c8c91d11148dfa (diff) | |
.......... [ZBXNEXT-1263] updated to the latest trunk, resolved conflict in dbupgrade_2050.c
Diffstat (limited to 'src/zabbix_agent/listener.c')
| -rw-r--r-- | src/zabbix_agent/listener.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/zabbix_agent/listener.c b/src/zabbix_agent/listener.c index f2971c32488..e4003b8f0dd 100644 --- a/src/zabbix_agent/listener.c +++ b/src/zabbix_agent/listener.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2014 Zabbix SIA +** Copyright (C) 2001-2015 Zabbix SIA ** ** 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 |