fixed merge issues
authorVictor Kirhenshtein <victor@netxms.org>
Mon, 6 Nov 2017 11:48:12 +0000 (13:48 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Mon, 6 Nov 2017 11:48:12 +0000 (13:48 +0200)
commitee53217c5624a6332958938384531a754814d3ff
treeccb9e8a51095ecf897c83a58ce8ac4b219d421f1
parent18e7ec4d7a0304173bed52e0a2a37212867c629e
fixed merge issues
build/msvc_setenv_x64.cmd
build/msvc_setenv_x86.cmd
src/libnxlp/libnxlp.vcxproj
src/libnxlp/libnxlp.vcxproj.filters
src/libnxlp/vss_srv2003.cpp
src/libnxlp/vss_xp.cpp