Merge remote-tracking branch 'upstream/master'

README.rst

-==============================
-          BEDTools         
-==============================
+===================================================
+bedtools - a swiss army knife for genome arithmetic         
+===================================================
 
-**Current version**: 2.18.1
+**Current version**: 2.18.2
 
 Note
 -------

src/annotateBed/annotateBed.cpp

@@ -189,11 +189,14 @@ void BedAnnotate::ReportAnnotations() {
                     int nonZeroBases   = (length - zeroDepthCount);
                     float fractCovered = (float) nonZeroBases / length;
                     if (_reportCounts == false && _reportBoth == false)
-                        printf("%f\t", fractCovered);
+                        printf("%f", fractCovered);
                     else if (_reportCounts == true && _reportBoth == false)
-                        printf("%d\t", bedItr->counts[i]);
+                        printf("%d", bedItr->counts[i]);
                     else if (_reportCounts == false && _reportBoth == true)
-                        printf("%d\t%f\t", bedItr->counts[i], fractCovered);
+                        printf("%d\t%f", bedItr->counts[i], fractCovered);
+
+                    if (i != _annoFiles.size() - 1)
+                        printf("\t");
                 }
                 // print newline for next feature.
                 printf("\n");

src/utils/version/version_release.txt

-# This file was auto-generated by running "make setversion VERSION=v2.18.1"
-# on Mon Dec 16 19:50:17 EST 2013 .
+# This file was auto-generated by running "make setversion VERSION=v2.18.2"
+# on Tue Jan  7 19:46:47 EST 2014 .
 # Please do not edit or commit this file manually.
 #
-v2.18.1
+v2.18.2