[DAQ-drivers] driver/ts branch, devel, updated. 3v6.3-2-ge97f900

[Bryan Moffit]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "driver/ts".

The branch, devel has been updated
       via  e97f900137e0f50501c4dfb6092f2fdeb3f323a1 (commit)
       via  b8e3aad7518298c231225c619f510749e790df44 (commit)
      from  4d068826dcccb3324527a0add61184bae169f856 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e97f900137e0f50501c4dfb6092f2fdeb3f323a1
Merge: 4d06882 b8e3aad
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Feb 3 12:28:27 2017 -0500

    Merge branch 'fix-dataFormat_reg' into devel

commit b8e3aad7518298c231225c619f510749e790df44
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Feb 3 12:27:49 2017 -0500

    Fix to keep dataFormat register bits when changing the data format.

-----------------------------------------------------------------------

Summary of changes:
 Makefile | 116 +++++++++++++++++++++++++++++++++++++++++----------------------
 tsLib.c  |   4 +--
 2 files changed, 77 insertions(+), 43 deletions(-)
 mode change 100755 => 100644 Makefile


hooks/post-receive
-- 
driver/ts