Commit [r3447] Maximize Restore History

Syncing nscldaq-11.0-filter-development with nscldaq-11.0-development through r3446

Resolved conflicts:
ui.tcl
- gridding of RunControl remains in _layoutWidgets as in nscldaq-11.0-development
branch but the -padx and -pady is added to the _layoutWidgets from
nscldaq-11.0-filter-development. In other words, both revision are accepted in a
merged state.

vmusbReadout.xml
- New driver documentation from 11.0-filter-dev branch incorporated and slow controls
documentation for VMUSBReadout remain in 5vmusb man section as in 11.0-dev branch.
In other words, both revisions are accepted.

nscldaq.in
- The nscldaq.in from 11.0-dev branch is accepted. I believe this was conflicted because
the change was already included.

jrtomps 2014-04-03

1 2 3 .. 5 > >> (Page 1 of 5)
removed /branches/nscldaq-11.0-filter-development/epics/controlpush/cmdline.c
changed /branches/nscldaq-11.0-filter-development/daq/readoutgui/ReadoutGui.tcl
changed /branches/nscldaq-11.0-filter-development/daq/readoutgui/sshProvider.tcl
changed /branches/nscldaq-11.0-filter-development/utilities/bufdump/dumper.xml
changed /branches/nscldaq-11.0-filter-development/usb/ccusb/rdothread/CAcquisitionThread.cpp
changed /branches/nscldaq-11.0-filter-development/Makefile.am
changed /branches/nscldaq-11.0-filter-development/usb/ccusb/ccusb/CCCUSB.cpp
changed /branches/nscldaq-11.0-filter-development/servers/tclserver/Makefile.am
changed /branches/nscldaq-11.0-filter-development/usb/ccusb/rdothread/Makefile.am
changed /branches/nscldaq-11.0-filter-development/sbs/scripted/Makefile.am
changed /branches/nscldaq-11.0-filter-development/daq/format/dataformat.xml
changed /branches/nscldaq-11.0-filter-development/usb/vmusb/CTheApplication.h
changed /branches/nscldaq-11.0-filter-development/daq/eventbuilder/CFragmentHandler.cpp
changed /branches/nscldaq-11.0-filter-development/daq/readoutgui/readoutgui.xml
changed /branches/nscldaq-11.0-filter-development/sbs/readout/CEventSegment.h
changed /branches/nscldaq-11.0-filter-development/base/dataflow/CRingBuffer.cpp
changed /branches/nscldaq-11.0-filter-development/daq/format/CRingScalerItem.h
changed /branches/nscldaq-11.0-filter-development/sbs/Makefile.am
changed /branches/nscldaq-11.0-filter-development/docconfig/config
changed /branches/nscldaq-11.0-filter-development/usb/vmusb/vmusb/CVMUSB.cpp
changed /branches/nscldaq-11.0-filter-development/sbs/readout/SBSReadout.xml
changed /branches/nscldaq-11.0-filter-development/daq/eventbuilder/evbRdoCallouts.tcl
changed /branches/nscldaq-11.0-filter-development/usb/vmusb/rdothread/Makefile.am
/branches/nscldaq-11.0-filter-development/daq/readoutgui/ReadoutGui.tcl Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/daq/readoutgui/sshProvider.tcl Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/utilities/bufdump/dumper.xml Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/usb/ccusb/rdothread/CAcquisitionThread.cpp Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/Makefile.am Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/usb/ccusb/ccusb/CCCUSB.cpp Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/servers/tclserver/Makefile.am Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/usb/ccusb/rdothread/Makefile.am Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/sbs/scripted/Makefile.am Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/daq/format/dataformat.xml Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/usb/vmusb/CTheApplication.h Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/daq/eventbuilder/CFragmentHandler.cpp Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/daq/readoutgui/readoutgui.xml Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/sbs/readout/CEventSegment.h Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/base/dataflow/CRingBuffer.cpp Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/daq/format/CRingScalerItem.h Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/sbs/Makefile.am Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/docconfig/config Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/usb/vmusb/vmusb/CVMUSB.cpp Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/sbs/readout/SBSReadout.xml Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/daq/eventbuilder/evbRdoCallouts.tcl Diff Switch to side-by-side view
Loading...
/branches/nscldaq-11.0-filter-development/usb/vmusb/rdothread/Makefile.am Diff Switch to side-by-side view
Loading...
1 2 3 .. 5 > >> (Page 1 of 5)