git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d55f07
665ed04
)
Merge branch 'develop' into Release_2_9_Branch
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Wed, 19 Aug 2015 10:53:18 +0000
(11:53 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Wed, 19 Aug 2015 10:53:18 +0000
(11:53 +0100)
Conflicts:
TESTNG (now added to .gitignore)
1
2
test/jalview/ws/jabaws/RNAStructExportImport.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
test/jalview/ws/jabaws/RNAStructExportImport.java
Simple merge
git://source.jalview.org / jalview.git / commitdiff