[Debian-iot-packaging] [openzwave-controlpanel] 58/81: Merge pull request #31 from xs4/master

[Dara Adib]

This is an automated email from the git hooks/post-receive script.

daradib-guest pushed a commit to branch debian/master
in repository openzwave-controlpanel.

commit 1ab5d463958a84c7e64b4f94b804c5b99d557599
Merge: 36152b8 021f2e8
Author: Justin Hammond <justin at dynam.ac>
Date:   Wed Jul 29 10:07:25 2015 +0800

    Merge pull request #31 from xs4/master
    
    add multi instance association support

 cp.js         | 29 ++++++++++++++++++++++++-----
 ozwcp.cpp     | 41 ++++++++++++++++++++++++++---------------
 ozwcp.h       |  4 ++--
 webserver.cpp |  4 +---
 zwavelib.cpp  |  8 ++++++++
 5 files changed, 61 insertions(+), 25 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/openzwave-controlpanel.git