projects / htsworkflow.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a68cfed 68da71c)
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Thu, 23 Jun 2011 21:56:46 +0000 (14:56 -0700)
committerDiane Trout <diane@caltech.edu>
Thu, 23 Jun 2011 21:56:46 +0000 (14:56 -0700)
commit523b1686664a648f396acecc6ce0bc3778e3efdf
treed32d6c674368bd0c23df1185d1a3f6fe268d0b0ftree | snapshot
parenta68cfed833d336ed1b89779951e1cf99851e6928commit | diff
parent68da71c8242b55ee1372093dfce4b23658023003commit | diff
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

Conflicts:
extra/ucsc_encode_submission/ucsc_gather.py
htsworkflow/submission/test/test_daf.py

Also merging the conflict was made more difficult by needing
to work around changes in the older version of librdf on 10.04
extra/ucsc_encode_submission/ucsc_gather.py diff1 | diff2 | blob | history
htsworkflow/submission/daf.py diff1 | diff2 | blob | history
htsworkflow/submission/test/test_daf.py diff1 | diff2 | blob | history
htsworkflow sequencing LIMS software