[PD-cvs] [git]pure-data branch, master, updated. 70e6882346e5ce5a2c8fa4f5c2876e6d2396e7b3

[Miller Puckette]

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 "pure-data".

The branch, master has been updated
       via  70e6882346e5ce5a2c8fa4f5c2876e6d2396e7b3 (commit)
       via  df9952d5a65a5a89b88948aced3419e83be4fa7a (commit)
       via  8795a69229390ef680587862ccfa646df934737a (commit)
       via  268b3bddd7b650d173dda56c71c7893b40d78a80 (commit)
      from  c8cee133b209d2a34c8994bba635ecb393ad0917 (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 70e6882346e5ce5a2c8fa4f5c2876e6d2396e7b3
Author: Miller Puckette <msp at ucsd.edu>
Date:   Tue Jan 3 16:14:38 2017 -0800

    fixed problem in previous merge

commit df9952d5a65a5a89b88948aced3419e83be4fa7a
Merge: c8cee13 8795a69
Author: Miller Puckette <msp at ucsd.edu>
Date:   Tue Jan 3 16:05:11 2017 -0800

    Merge branch 'feature/jacknoconnect' of https://github.com/x37v/pure-data into nojackconnect
    
    Conflicts:
    	src/s_audio_jack.c
    	src/s_main.c
    	src/s_stuff.h

commit 8795a69229390ef680587862ccfa646df934737a
Author: Alex Norman <xnor at perfectco.com>
Date:   Thu Jun 9 10:16:13 2016 -0700

    changed jack connection flag name and added a positive
    
    per @umlaeute's comment on PR #20

commit 268b3bddd7b650d173dda56c71c7893b40d78a80
Author: Alex Norman <x37v.alex at gmail.com>
Date:   Wed Jun 8 19:02:02 2016 -0700

    can now disable automatic jack connections

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

Summary of changes:
 src/s_audio_jack.c |    8 +++++++-
 src/s_main.c       |   14 ++++++++++++++
 src/s_stuff.h      |    1 +
 3 files changed, 22 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
pure-data