Merge branch 'develop' of git.netxms.org:public/netxms into develop
authorMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Sun, 5 Oct 2014 15:45:00 +0000 (17:45 +0200)
committerMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Sun, 5 Oct 2014 15:45:00 +0000 (17:45 +0200)
commitdabe0445b3493dc7765cd23c72aab92d94dd7b8e
treed04481c3c08b3a5956c08b6df7118e5078ed71a2
parent4d4b3ff3ca88f421eec7f89a9786248649df5e56
parentd999988d1f425a222aa691a6f7626fe39eaf74cb
Merge branch 'develop' of git.netxms.org:public/netxms into develop
android/src/console/src/org/netxms/ui/android/main/adapters/OverviewAdapter.java