[Nscldaq-cvscommits] SF.net SVN: nscldaq:[5128] tags/nscldaq-11.0-018/

[<ro...@us...>]

Revision: 5128
          http://sourceforge.net/p/nscldaq/code/5128
Author:   ron-fox
Date:     2015-11-06 12:36:10 +0000 (Fri, 06 Nov 2015)
Log Message:
-----------
Fixes to some broken-ness in 017

Added Paths:
-----------
    tags/nscldaq-11.0-018/

Index: tags/nscldaq-11.0-018
===================================================================
--- trunk/main	2015-11-06 12:21:47 UTC (rev 5127)
+++ tags/nscldaq-11.0-018	2015-11-06 12:36:10 UTC (rev 5128)

Property changes on: tags/nscldaq-11.0-018
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,27 ##
+/branches/11.0-s800conv-development:3453-4324
+/branches/11.0-s800conv-fixes:4745-4796
+/branches/feature-EVBMonitorThread:5008-5019
+/branches/features-nscldaq-11.0-014:5026-5066
+/branches/hira-sisstuff:2744-2997
+/branches/nextgen-ccusb-feature:2631-2641
+/branches/nextgen-ccusb-userdrivers-feature:2644-2659
+/branches/nextgen-vmusb-userdrivers-feature:2665-2711
+/branches/nscldaq-10.1-004-development:2714-2742
+/branches/nscldaq-10.2-001-development:2931-2998
+/branches/nscldaq-10.2-development:2749-2997
+/branches/nscldaq-11.0-000-development:4472-4669
+/branches/nscldaq-11.0-docs:4441-4445
+/branches/nscldaq-11.0-filter-development:3275-3450
+/branches/nscldaq-11.0-mdgg16:4328-4438
+/branches/nscldaq-11.0-rc12-development:3723-3888
+/branches/nscldaq-11.0-rc14:3900-3953
+/branches/nscldaq-11.0-rc15:3967-4096
+/branches/nscldaq-11.0-rc16:4105-4159
+/branches/nscldaq-11.0-rc17-development:4301-4372
+/branches/nscldaq-11.0-rc18:4395-4453
+/branches/nscldaq-11.x-mqdc:4448-4549
+/branches/revert-main:4668-4675
+/branches/vmusbremote-development:2803
+/tags/hira-sisstuff-pre-merge:2893-2918
+/tags/vmusbremote-working:2804-2816
+/trunk/nextgen:3002-3154
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.