[med-svn] [plink1.9] 02/03: Merge tag 'upstream/1.90_b3.28-151216'

[Dylan Aïssi]

This is an automated email from the git hooks/post-receive script.

bob.dybian-guest pushed a commit to branch master
in repository plink1.9.

commit ae7a77cb0d5d61153ad4ecacaaa02bc7c11489e3
Merge: a698c34 597ab21
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Fri Dec 18 19:55:27 2015 +0100

    Merge tag 'upstream/1.90_b3.28-151216'
    
    Upstream version 1.90~b3.28-151216

 Makefile        |    2 +-
 plink.c         | 1020 +++++++++++++++++++---------------
 plink_assoc.c   |  742 +++----------------------
 plink_assoc.h   |   10 -
 plink_calc.c    |   33 +-
 plink_cluster.c |   15 +-
 plink_cluster.h |    2 +-
 plink_common.c  |  175 +++---
 plink_common.h  |   90 +--
 plink_data.c    | 1654 +++++++++++++++++++++++++++++++++----------------------
 plink_data.h    |    8 +-
 plink_dosage.c  |   90 +--
 plink_dosage.h  |    7 +-
 plink_family.c  | 1270 +++++++++++++++++++++++++++++++++++++++---
 plink_family.h  |    2 +-
 plink_filter.c  |  237 ++++----
 plink_filter.h  |   24 +-
 plink_glm.c     |  111 ++--
 plink_help.c    |   39 +-
 plink_lasso.c   |    1 +
 plink_ld.c      |  104 ++--
 plink_misc.c    |  244 +++++---
 plink_misc.h    |    1 +
 plink_perm.c    |  333 +++++++++++
 plink_perm.h    |  196 +++++++
 plink_set.c     |   85 ++-
 plink_set.h     |    4 +-
 27 files changed, 4186 insertions(+), 2313 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/plink1.9.git