Merged changes from 3.14 branch

Up to revno 12420 inclusive.
2013-06-07 18:08:38 -05:00
parent 2eb48f43eb ef5d88d3e5
commit 2be5e15346
27 changed files with 246 additions and 153 deletions
@@ -74,7 +74,7 @@ void dbSubscriptionIO::destructor ( CallbackGuard & cbGuard,
 }

 void dbSubscriptionIO::unsubscribe ( CallbackGuard & cbGuard, 
-                                epicsGuard < epicsMutex > & guard )
+    epicsGuard < epicsMutex > & guard )
 {
    guard.assertIdenticalMutex ( this->mutex );
    if ( this->es ) {