git://source.jalview.org / jalview.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8b985fa) | patch
JAL-952 fixed unresolved conflict breaking build
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 12:30:26 +0000 (13:30 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 12:30:26 +0000 (13:30 +0100)
commit7377fb763b212300084f293fcfb6789eb5e49ff3
tree4eb1a16be7955cb03877a3053ceb6b10d720820ftree | snapshot
parent8b985fad9a206fb678e8f84f65a1659c00e49d93commit | diff
JAL-952 fixed unresolved conflict breaking build
src/jalview/schemes/ColourSchemeProperty.java diff | blob | history