Merge branch 'issue-510' into develop
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 21 Feb 2014 22:39:35 +0000 (00:39 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 21 Feb 2014 22:39:35 +0000 (00:39 +0200)
commit566c4669675acd7cc2bfcc7d63fc4c6bcaa4f1bc
tree75fe37c7dd7d744828f9ef9ba4dc9716d7bbe68e
parent04278c4a252053d80ce90ae72a0621fd62e5eef2
parentf31c22b36a53de53af7510863d8e2cc9512dcfdb
Merge branch 'issue-510' into develop
src/agent/core/nxagentd.cpp
src/agent/core/nxagentd.h