Merge made by recursive. python/lib/README | 2 +- python/lib/ucscGb/qa/tables/pointerQa.py | 11 +- python/lib/ucscGb/qa/tables/positionalQa.py | 80 ++- python/lib/ucscGb/qa/tables/tableQa.py | 7 +- python/style.txt | 12 +- python/virtual.txt | 2 + .../ENCODE/dataMatrix/encodeChipMatrixHuman.html | 6 +- .../ENCODE/dataMatrix/encodeChipMatrixMouse.html | 15 +- .../ENCODE/dataMatrix/encodeDataMatrixHuman.html | 6 +- .../ENCODE/dataMatrix/encodeDataMatrixMouse.html | 14 +- .../ENCODE/dataMatrix/encodeDataSummaryHuman.html | 6 +- .../ENCODE/dataMatrix/encodeDataSummaryMouse.html | 11 +- src/hg/htdocs/ENCODE/index.html | 5 +- src/hg/htdocs/ENCODE/releaseLog.html | 2 +- src/hg/htdocs/goldenPath/pubs.html | 38 +- src/hg/htdocs/goldenPath/releaseLog.html | 2 +- src/hg/htdocs/images/Canis_lupus_familiaris.jpg | Bin 0 -> 11803 bytes src/hg/htdocs/inc/encodeProject.topbar.html | 9 +- src/hg/js/encodeChipMatrix.js | 18 +- src/hg/js/encodeDataMatrix.js | 52 +- src/hg/js/encodeDataSummary.js | 4 +- src/hg/js/encodeMatrix.js | 35 +- src/hg/js/encodeProject.js | 58 ++- src/hg/makeDb/doc/latCha1.txt | 90 +++ src/hg/makeDb/doc/saiBol1.txt | 90 +++ src/hg/makeDb/genbank/etc/align.dbs | 2 + src/hg/makeDb/genbank/etc/hgwdev.dbs | 2 + src/hg/makeDb/genbank/etc/rr.dbs | 2 + src/hg/makeDb/schema/all.joiner | 13 +- src/hg/makeDb/trackDb/cv/alpha/cv.ra | 1 + src/hg/makeDb/trackDb/dog/canFam3/description.html | 115 +--- src/hg/makeDb/trackDb/human/decodeRmap.html | 14 +- .../hg19/metaDb/alpha/wgEncodeUmassDekker5C.ra | 6 +- .../human/hg19/metaDb/alpha/wgEncodeUw5C.ra | 6 +- .../makeDb/trackDb/human/hg19/trackDb.wgEncode.ra | 26 +- .../trackDb/human/hg19/wgEncodeGencodeSuper.html | 140 +++- .../human/hg19/wgEncodeGencodeV10.release2.ra | 224 ++++++ .../human/hg19/wgEncodeGencodeV11.release2.ra | 224 ++++++ .../makeDb/trackDb/human/hg19/wgEncodeGencodeV3.ra | 3 +- .../makeDb/trackDb/human/hg19/wgEncodeGencodeV4.ra | 3 +- .../makeDb/trackDb/human/hg19/wgEncodeGencodeV5.ra | 3 +- .../makeDb/trackDb/human/hg19/wgEncodeGencodeV6.ra | 1 + .../human/hg19/wgEncodeGencodeV7.release2.ra | 189 +++++ .../makeDb/trackDb/human/hg19/wgEncodeGencodeV9.ra | 1 + .../trackDb/human/hg19/wgEncodeSuper.release2.ra | 78 ++ .../human/hg19/wgEncodeUmassDekker5C.patch.html | 212 ++++++ .../human/hg19/wgEncodeUmassDekker5C.patch.ra | 59 ++ .../trackDb/human/hg19/wgEncodeUw5C.patch2.html | 139 ++++ .../trackDb/human/hg19/wgEncodeUw5C.patch2.ra | 13 + .../mouse/mm9/metaDb/alpha/wgEncodeSydhRnaSeq.ra | 762 +++++++++++++++++--- .../trackDb/mouse/mm9/wgEncodePsuRnaSeq.html | 176 +++++ .../makeDb/trackDb/mouse/mm9/wgEncodeSydhRnaSeq.ra | 138 ++-- src/hg/makeDb/trackDb/rat/rn5/description.html | 115 +--- src/hg/utils/automation/doBlastzChainNet.pl | 12 +- src/hg/utils/automation/doWindowMasker.pl | 2 +- 55 files changed, 2711 insertions(+), 545 deletions(-) create mode 100644 src/hg/htdocs/images/Canis_lupus_familiaris.jpg create mode 100644 src/hg/makeDb/trackDb/human/hg19/wgEncodeGencodeV10.release2.ra create mode 100644 src/hg/makeDb/trackDb/human/hg19/wgEncodeGencodeV11.release2.ra create mode 100644 src/hg/makeDb/trackDb/human/hg19/wgEncodeGencodeV7.release2.ra create mode 100644 src/hg/makeDb/trackDb/human/hg19/wgEncodeSuper.release2.ra create mode 100644 src/hg/makeDb/trackDb/human/hg19/wgEncodeUmassDekker5C.patch.html create mode 100644 src/hg/makeDb/trackDb/human/hg19/wgEncodeUmassDekker5C.patch.ra create mode 100644 src/hg/makeDb/trackDb/human/hg19/wgEncodeUw5C.patch2.html create mode 100644 src/hg/makeDb/trackDb/human/hg19/wgEncodeUw5C.patch2.ra create mode 100644 src/hg/makeDb/trackDb/mouse/mm9/wgEncodePsuRnaSeq.html