File Changes for mmaddren

v259_preview to v259_preview2 (2011-10-25 to 2011-11-01) v259

• python/lib/ucscgenomics/track.py
  • lines changed 1, context: html, text, full: html, text
    minor bug fix for composite track
  • lines changed 22, context: html, text, full: html, text
    style.txt updated, fixed merge conflict
• python/programs/mkGeoPkg/mkGeoPkg
  • lines changed 104, context: html, text, full: html, text
    minor updates to mkGeoPkg
  • lines changed 707, context: html, text, full: html, text
    somehow these got removed when I pulled??? I put them back
• python/programs/trackInfo/trackInfo
  • lines changed 8, context: html, text, full: html, text
    trackInfo now supports the bam/bai comma separated filenames, style guide updated
  • lines changed 182, context: html, text, full: html, text
    somehow these got removed when I pulled??? I put them back
• python/style.txt
  • lines changed 30, context: html, text, full: html, text
    trackInfo now supports the bam/bai comma separated filenames, style guide updated
  • lines changed 36, context: html, text, full: html, text
    style.txt updated, fixed merge conflict
• src/hg/encode/mkGeoPkg/mkGeoPkg
  • lines changed 707, context: html, text, full: html, text
    style.txt updated, fixed merge conflict
• src/hg/encode/trackInfo/trackInfo
  • lines changed 182, context: html, text, full: html, text
    style.txt updated, fixed merge conflict