git://source.jalview.org / jalview.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5c33de4 0fce6c9)
Merge branch 'feature/JAL-1333' into features/JAL-1333
authorJim Procter <jprocter@Jims-MacBook-Pro-2.local>
Tue, 1 Jul 2014 22:28:04 +0000 (15:28 -0700)
committerJim Procter <jprocter@Jims-MacBook-Pro-2.local>
Tue, 1 Jul 2014 22:28:04 +0000 (15:28 -0700)
commita94284081155efc1183fac5d8254826db542a933
tree0e4e552845ff0d0d938b196ef6cb49cc87c81880tree | snapshot
parent5c33de4092732a61c2bc4ab3cb76b773752ad37acommit | diff
parent0fce6c9a84f00e16b87848e35516a12a92685b57commit | diff
Merge branch 'feature/JAL-1333' into features/JAL-1333

Conflicts:
.classpath
.classpath diff1 | diff2 | blob | history