Bug 1607: Checkin of merge of branch MAC-20101206-1_0-release-branch...
Bug 1607: Checkin of merge of branch MAC-20101206-1_0-release-branch (svn-17633 - svn-17649) in trunk after resolving conflicts with ParentControl.cc and ControllerDefines.cc
Showing
- MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h 2 additions, 1 deletionMAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h
- MAC/APL/APLCommon/src/ChildControl.cc 19 additions, 36 deletionsMAC/APL/APLCommon/src/ChildControl.cc
- MAC/APL/APLCommon/src/ControllerDefines.cc 11 additions, 9 deletionsMAC/APL/APLCommon/src/ControllerDefines.cc
- MAC/APL/APLCommon/src/Controller_Protocol.prot 24 additions, 5 deletionsMAC/APL/APLCommon/src/Controller_Protocol.prot
- MAC/APL/APLCommon/src/ParentControl.cc 75 additions, 38 deletionsMAC/APL/APLCommon/src/ParentControl.cc
- MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc 2 additions, 2 deletionsMAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
- MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc 7 additions, 2 deletionsMAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
- MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc 47 additions, 71 deletionsMAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
- MAC/APL/MainCU/src/ObservationControl/ObservationControl.h 1 addition, 0 deletionsMAC/APL/MainCU/src/ObservationControl/ObservationControl.h
- MAC/APL/RTDBCommon/src/ClaimMgrTask.cc 2 additions, 1 deletionMAC/APL/RTDBCommon/src/ClaimMgrTask.cc
- MAC/APL/StationCU/src/StationControl/ActiveObs.cc 1 addition, 2 deletionsMAC/APL/StationCU/src/StationControl/ActiveObs.cc
- MAC/APL/StationCU/src/StationControl/StationControl.cc 8 additions, 6 deletionsMAC/APL/StationCU/src/StationControl/StationControl.cc
- MAC/MACIO/src/ProtocolDefs.cc 4 additions, 0 deletionsMAC/MACIO/src/ProtocolDefs.cc
Loading
Please register or sign in to comment