From abfbe423f2db1399c067e4a3b043cf1217702336 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 29 Sep 2014 11:04:17 -0700
Subject: [PATCH] Imported Upstream version 1.2.17

---
 .gitignore  | 20 --------------------
 WHAT_IS_NEW |  6 ++++++
 2 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 794b993..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-*.o
-*.a
-*~
-rsem-bam2readdepth
-rsem-bam2wig
-rsem-build-read-index
-rsem-calculate-credibility-intervals
-rsem-extract-reference-transcripts
-rsem-get-unique
-rsem-parse-alignments
-rsem-preref
-rsem-run-em
-rsem-run-gibbs
-rsem-simulate-reads
-rsem-synthesis-reference-transcripts
-rsem-tbam2gbam
-rsem-sam-validator
-rsem-scan-for-paired-end-reads
-EBSeq/rsem-for-ebseq-calculate-clustering-info
-sam/samtools
diff --git a/WHAT_IS_NEW b/WHAT_IS_NEW
index e9def23..76643c5 100644
--- a/WHAT_IS_NEW
+++ b/WHAT_IS_NEW
@@ -1,3 +1,9 @@
+RSEM v1.2.17
+
+- Added error detection for cases such as a read's two mates having different names or a read is both alignable and unalignable
+
+--------------------------------------------------------------------------------------------
+
 RSEM v1.2.16
 
 - Corrected a typo in 'rsem-generate-data-matrix', this script extracts 'expected_count' column instead of 'TPM' column
-- 
2.39.2