completed merge

This commit is contained in:
Matej Sekoranja
2014-06-10 00:09:08 +02:00
61 changed files with 3280 additions and 1955 deletions

View File

@@ -61,7 +61,7 @@ class ChannelAccessIFRemoteTest: public ChannelAccessIFTest {
virtual ChannelProvider::shared_pointer getChannelProvider() {
return getChannelAccess()->getProvider(
return getChannelProviderRegistry()->getProvider(
"pva");
}