File Changes for kate

v254_preview2 to v254_base (2011-07-12 to 2011-07-19) v254

• src/hg/encode/encodeExp/encodeExp
  • lines changed 20919, context: html, text, full: html, text
    Merging with origin
  • lines changed 0, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/foo.ra
  • lines changed 3296, context: html, text, full: html, text
    Merging with origin
  • lines changed 3296, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/hg18.in.ra
  • lines changed 5712, context: html, text, full: html, text
    Merging with origin
  • lines changed 5712, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/hg18.new.ra
  • lines changed 553, context: html, text, full: html, text
    Merging with origin
  • lines changed 553, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/hg18.newest.ra
  • lines changed 881, context: html, text, full: html, text
    Merging with origin
  • lines changed 881, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/hg19.dump
  • lines changed 56, context: html, text, full: html, text
    Merging with origin
  • lines changed 56, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/hg19.found.ra
  • lines changed 12803, context: html, text, full: html, text
    Merging with origin
  • lines changed 12803, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/hg19.in.ra
  • lines changed 7756, context: html, text, full: html, text
    Merging with origin
  • lines changed 7756, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/hg19.new.ra
  • lines changed 12201, context: html, text, full: html, text
    Merging with origin
  • lines changed 12201, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/hg19.newest.ra
  • lines changed 12681, context: html, text, full: html, text
    Merging with origin
  • lines changed 12681, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/hg19.out.ra
  • lines changed 16461, context: html, text, full: html, text
    Merging with origin
  • lines changed 16461, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/hg19.ra
  • lines changed 11238, context: html, text, full: html, text
    Merging with origin
  • lines changed 11238, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/hg19.tues.ra
  • lines changed 12446, context: html, text, full: html, text
    Merging with origin
  • lines changed 12446, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/hg19.txt
  • lines changed 1873, context: html, text, full: html, text
    Merging with origin
  • lines changed 1873, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/meta.ra
  • lines changed 13027, context: html, text, full: html, text
    Merging with origin
  • lines changed 13027, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/mm9.9pm.ra
  • lines changed 259, context: html, text, full: html, text
    Merging with origin
  • lines changed 259, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/mm9.in.ra
  • lines changed 259, context: html, text, full: html, text
    Merging with origin
  • lines changed 259, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/mm9.new.ra
  • lines changed 0, context: html, text, full: html, text
    Merging with origin
  • lines changed 0, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/mm9.newest.ra
  • lines changed 539, context: html, text, full: html, text
    Merging with origin
  • lines changed 539, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/mm9.tues.ra
  • lines changed 535, context: html, text, full: html, text
    Merging with origin
  • lines changed 535, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/new.out.ra
  • lines changed 4527, context: html, text, full: html, text
    Merging with origin
  • lines changed 4527, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/old.out.ra
  • lines changed 16857, context: html, text, full: html, text
    Merging with origin
  • lines changed 16857, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/out.ra
  • lines changed 14984, context: html, text, full: html, text
    Merging with origin
  • lines changed 14984, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/out.txt
  • lines changed 1873, context: html, text, full: html, text
    Merging with origin
  • lines changed 1873, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/junk/test.ra
  • lines changed 21, context: html, text, full: html, text
    Merging with origin
  • lines changed 21, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/tags
  • lines changed 37, context: html, text, full: html, text
    Merging with origin
  • lines changed 37, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeExp/temp.ra
  • lines changed 161, context: html, text, full: html, text
    Merging with origin
  • lines changed 161, context: html, text, full: html, text
    Removing junk
• src/hg/encode/encodeMkGeoPkg/ucsc_encode_dcc_wgEncodeCaltechRnaSeq.soft
  • lines changed 1733, context: html, text, full: html, text
    Merging with origin
  • lines changed 1733, context: html, text, full: html, text
    Removing junk
• src/hg/encode/hgEncodeMatrix/hgEncodeMatrix.c
  • lines changed 196, context: html, text, full: html, text
    Merging with origin
  • lines changed 196, context: html, text, full: html, text
    Removing junk
• src/hg/encode/hgEncodeSubmit/config/database.yml
  • lines changed 81, context: html, text, full: html, text
    Merging with origin
  • lines changed 81, context: html, text, full: html, text
    Removing junk
• src/hg/encode/hgEncodeSubmit/config/environment.rb
  • lines changed 92, context: html, text, full: html, text
    Merging with origin
  • lines changed 92, context: html, text, full: html, text
    Removing junk
• src/hg/encode/hgEncodeSubmit/go
  • lines changed 2, context: html, text, full: html, text
    Merging with origin
  • lines changed 2, context: html, text, full: html, text
    Removing junk
• src/hg/encode/hgEncodeSubmit/stop
  • lines changed 3, context: html, text, full: html, text
    Merging with origin
  • lines changed 3, context: html, text, full: html, text
    Removing junk
• src/hg/hgGateway/tags
  • lines changed 18, context: html, text, full: html, text
    Merging with origin
  • lines changed 18, context: html, text, full: html, text
    Removing junk
• src/hg/htdocs/ENCODE/dataMatrix/sav
  • lines changed 76, context: html, text, full: html, text
    Merging with origin
  • lines changed 76, context: html, text, full: html, text
    Removing junk
• src/hg/htdocs/ENCODE/index.html
  • lines changed 105, context: html, text, full: html, text
    Add June and July news items
  • lines changed 4, context: html, text, full: html, text
    Add Usage Resources page to portal
• src/hg/htdocs/ENCODE/newsarch.html
  • lines changed 45, context: html, text, full: html, text
    Add June and July news items
• src/hg/htdocs/ENCODE/usageResources.html
  • lines changed 73, context: html, text, full: html, text
    Add Usage Resources page to portal
• src/hg/htdocs/images/floretPreview.kuhn.jpg
  • lines changed 253, context: html, text, full: html, text
    Merging with origin
  • lines changed 0, context: html, text, full: html, text
    Removing junk
• src/hg/lib/TAGS
  • lines changed 28029, context: html, text, full: html, text
    Merging with origin
  • lines changed 28029, context: html, text, full: html, text
    Removing junk
• src/hg/lib/encode/encodeExp.c
  • lines changed 21, context: html, text, full: html, text
    Allow Control terms for Antibody type (non-canonical validation of term for type -- should eventually go into cv.c
  • lines changed 21, context: html, text, full: html, text
    Merging with origin
• src/hg/lib/make.out
  • lines changed 71, context: html, text, full: html, text
    Merging with origin
  • lines changed 71, context: html, text, full: html, text
    Removing junk
• src/hg/lib/mdb.c
  • lines changed 1, context: html, text, full: html, text
    Allow Control terms for Antibody type (non-canonical validation of term for type -- should eventually go into cv.c
  • lines changed 1, context: html, text, full: html, text
    Too much information
• src/hg/lib/stash/exp/mdb.c
  • lines changed 3419, context: html, text, full: html, text
    Merging with origin
  • lines changed 3419, context: html, text, full: html, text
    Removing junk
• src/hg/lib/tags
  • lines changed 30974, context: html, text, full: html, text
    Merging with origin
  • lines changed 30974, context: html, text, full: html, text
    Removing junk
• src/hg/makeDb/mdbUpdate/tests/output/chipSeqTest1.ra
  • lines changed 191, context: html, text, full: html, text
    Merging with origin
  • lines changed 191, context: html, text, full: html, text
    Removing junk
• src/hg/makeDb/mdbUpdate/tests/output/expTest1.ra
  • lines changed 7, context: html, text, full: html, text
    Merging with origin
  • lines changed 7, context: html, text, full: html, text
    Removing junk
• src/hg/makeDb/trackDb/cv/alpha/.cv.ra.swp
  • lines changed 19, context: html, text, full: html, text
    Merging with origin
  • lines changed 0, context: html, text, full: html, text
    Removing junk
• src/hg/makeDb/trackDb/cv/alpha/cv.tier2.5.ra
  • lines changed 10392, context: html, text, full: html, text
    Merging with origin
  • lines changed 10392, context: html, text, full: html, text
    Removing junk
• src/hg/makeDb/trackDb/cv/alpha/junk/cv.txt
  • lines changed 1433, context: html, text, full: html, text
    Merging with origin
  • lines changed 1433, context: html, text, full: html, text
    Removing junk
• src/hg/makeDb/trackDb/human/hg19/junk/boo
  • lines changed 56, context: html, text, full: html, text
    Merging with origin
  • lines changed 56, context: html, text, full: html, text
    Removing junk
• src/hg/makeDb/trackDb/human/hg19/junk/showStatus.csh
  • lines changed 3, context: html, text, full: html, text
    Merging with origin
  • lines changed 3, context: html, text, full: html, text
    Removing junk
• src/hg/makeDb/trackDb/human/hg19/junk/temp
  • lines changed 12, context: html, text, full: html, text
    Merging with origin
  • lines changed 12, context: html, text, full: html, text
    Removing junk
• src/hg/makeDb/trackDb/human/hg19/junk/temp.txt
  • lines changed 221, context: html, text, full: html, text
    Merging with origin
  • lines changed 221, context: html, text, full: html, text
    Removing junk
• src/hg/makeDb/trackDb/human/hg19/wgEncodeTfBindingSuper.html
  • lines changed 4, context: html, text, full: html, text
    Temporary ad for Previw browser (will be replaced by hgTrackUi note after next release)
• src/inc/sav/common.mk
  • lines changed 201, context: html, text, full: html, text
    Merging with origin
  • lines changed 201, context: html, text, full: html, text
    Removing junk
• src/makelibs.out
  • lines changed 119, context: html, text, full: html, text
    Merging with origin
  • lines changed 119, context: html, text, full: html, text
    Removing junk