merge

2015-10-15 21:18:56 +02:00
parent bb5d7cae6c 5884d5b778
commit 55328e4a53
14 changed files with 1359 additions and 32 deletions
--- a/src/ca/caChannel.cpp
+++ b/src/ca/caChannel.cpp
@@ -1438,8 +1438,6 @@ void CAChannelMonitor::release(epics::pvData::MonitorElementPtr const & /*monito
    // noop
 }

-
-
 /* --------------- epics::pvData::ChannelRequest --------------- */

 void CAChannelMonitor::cancel()