Merge branch 'private_cas'
authorAlex Kirhenshtein <alk@netxms.org>
Wed, 10 Jul 2013 11:18:01 +0000 (11:18 +0000)
committerAlex Kirhenshtein <alk@netxms.org>
Wed, 10 Jul 2013 11:18:01 +0000 (11:18 +0000)
commit8a928932420e306451a39cc863cdf1fe280d33f3
treeeb2a78778a4a0f4310d660978baaaa8d64961b6c
parent6944bcebf0e2f53b99c92468437164e840010665
Merge branch 'private_cas'

Conflicts:
src/java/netxms-client-api/src/main/java/org/netxms/api/client/reporting/ReportingServerManager.java
include/nxclapi.h
src/java/netxms-client-api/src/main/java/org/netxms/api/client/constants/ScheduleType.java [new file with mode: 0644]
src/java/netxms-client-api/src/main/java/org/netxms/api/client/reporting/ReportingServerManager.java
src/java/netxms-client/src/main/java/org/netxms/client/NXCSession.java
src/server/core/Makefile.am
src/server/core/session.cpp
webui/webapp/Core/.classpath
webui/webapp/Core/src/org/netxms/webui/core/ApplicationWorkbenchWindowAdvisor.java