[Debian-iot-packaging] [openzwave-controlpanel] 52/81: Merge pull request #29 from OpenZWave/New-CC

[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 92d70eab045c40750069391b5181aaa2a73f1032
Merge: c243d37 3a90176
Author: Justin Hammond <justin at dynam.ac>
Date:   Wed Jul 8 23:25:18 2015 +0800

    Merge pull request #29 from OpenZWave/New-CC
    
    New cc

 cp.js         | 19 +++++++++++++------
 webserver.cpp | 14 ++++++++++++--
 zwavelib.cpp  |  4 +---
 3 files changed, 26 insertions(+), 11 deletions(-)

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