projects / mussa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 263c577) | patch
resolve complicated merge conflict
authorDiane Trout <diane@caltech.edu>
Thu, 9 Mar 2006 00:09:49 +0000 (00:09 +0000)
committerDiane Trout <diane@caltech.edu>
Thu, 9 Mar 2006 00:09:49 +0000 (00:09 +0000)
commita2c99dd6b057c7084f84871540a1db2e94abf50c
tree0982468e9ea4561dd241ee41812573ad4f385829tree | snapshot
parent263c577e74c6a9d986ea02dc6f2a41ac965d488fcommit | diff
resolve complicated merge conflict
Ok so trac-darcs doesn't handle renaming directories that have stuff
in them, so I made a new version of that patch, and then pulled
a the original version on top.

needless to say this led to some merge conflicts. hopefully this patch
resolves those conflicts.
12 files changed:
Makefile.noqt diff | blob | history
alg/glsequence.cxx [new file with mode: 0644] blob
alg/glsequence.h [new file with mode: 0644] blob
alg/test-conflict/test_conserved_path.cxx [deleted file] blob | history
alg/test/module.mk diff | blob | history
alg/test/test_conserved_path.cxx [new file with mode: 0644] blob
alg/test/test_glsequence.cxx diff | blob | history
mussagl.pro diff | blob | history
qui/GlSequence.cxx [deleted file] blob | history
qui/GlSequence.h [deleted file] blob | history
qui/PathScene.cxx diff | blob | history
qui/PathScene.h diff | blob | history
MUSSA multi-species alignment tool