git://source.jalview.org / jabaws.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: b19d5c3)
Merge branch 'JABAWS_Release_2_0'
authorSasha <Main-laptop2>
Fri, 14 Jun 2013 13:59:36 +0000 (14:59 +0100)
committerSasha <Main-laptop2>
Fri, 14 Jun 2013 13:59:36 +0000 (14:59 +0100)
Conflicts:
.project
.settings/org.eclipse.wst.common.component


No differences found