[med-svn] [trinityrnaseq] 03/03: Merge tag 'upstream/2.1.1+dfsg'

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository trinityrnaseq.

commit 13145f17a6c0a25204f361c185553270508ae02d
Merge: 7118b19 fdeb4cb
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Mon Feb 22 04:11:00 2016 -0800

    Merge tag 'upstream/2.1.1+dfsg'
    
    Upstream version 2.1.1+dfsg

 galaxy-plugin/EdgeR_differentialExpression.xml     |   38 -
 .../EdgeR_differentialExpression_wrapper.py        |   40 -
 .../GauravGalaxy/EdgeR_differentialExpression.xml  |   38 -
 .../EdgeR_differentialExpression_wrapper.py        |   40 -
 .../GauravGalaxy/RSEM_estimates_to_matrix.xml      |   51 -
 galaxy-plugin/GauravGalaxy/Trinity                 | 2707 --------------------
 .../GauravGalaxy/__add_to_PATH_setting.txt         |    1 -
 .../abundance_estimation_to_matrix.xml             |   42 -
 .../abundance_estimation_to_matrix_wrapper.py      |   40 -
 .../GauravGalaxy/align_and_estimate_abundance.xml  |   90 -
 galaxy-plugin/GauravGalaxy/alignreads.xml          |  138 -
 galaxy-plugin/GauravGalaxy/analyze_diff_exp.xml    |   41 -
 .../GauravGalaxy/analyze_diff_exp_wrapper.py       |   63 -
 .../GauravGalaxy/bash_command_executer.py          |   44 -
 galaxy-plugin/GauravGalaxy/cat.xml                 |   41 -
 galaxy-plugin/GauravGalaxy/diffExpress_edgeR.xml   |   47 -
 galaxy-plugin/GauravGalaxy/transcriptsToOrfs.xml   |   53 -
 galaxy-plugin/GauravGalaxy/trinityToolWrapper.py   |   82 -
 galaxy-plugin/GauravGalaxy/trinityrnaseq.xml       |  127 -
 .../trinityrnaseq.xml.Graham_version_022014        |  127 -
 galaxy-plugin/GauravGalaxy/trinityrnaseq_norm.xml  |  102 -
 galaxy-plugin/RSEM_abundance_estimation.xml        |   72 -
 galaxy-plugin/RSEM_estimates_to_matrix.xml         |   51 -
 galaxy-plugin/Trinity                              | 2707 --------------------
 galaxy-plugin/__add_to_PATH_setting.txt            |    1 -
 galaxy-plugin/abundance_estimation_to_matrix.xml   |   42 -
 .../abundance_estimation_to_matrix_wrapper.py      |   40 -
 galaxy-plugin/align_and_estimate_abundance.xml     |   90 -
 galaxy-plugin/alignreads.xml                       |  138 -
 galaxy-plugin/analyze_diff_exp.xml                 |   41 -
 galaxy-plugin/analyze_diff_exp_wrapper.py          |   63 -
 galaxy-plugin/bash_command_executer.py             |   44 -
 galaxy-plugin/cat.xml                              |   41 -
 galaxy-plugin/diffExpress_edgeR.xml                |   47 -
 galaxy-plugin/transcriptsToOrfs.xml                |   53 -
 galaxy-plugin/trinityToolWrapper.py                |   82 -
 galaxy-plugin/trinityrnaseq.xml                    |  127 -
 .../trinityrnaseq.xml.Graham_version_022014        |  127 -
 galaxy-plugin/trinityrnaseq_norm.xml               |  102 -
 39 files changed, 7820 deletions(-)

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