git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ebe550d
e1476d3
)
Merge branch 'JAL-1139_proguard' into Release_2_8_1_Branch
author
Jim Procter
<jprocter@compbio.dundee.ac.uk>
Mon, 25 Nov 2013 18:36:26 +0000
(18:36 +0000)
committer
Jim Procter
<jprocter@compbio.dundee.ac.uk>
Mon, 25 Nov 2013 18:36:26 +0000
(18:36 +0000)
Conflicts:
lib/Jmol-12.2.4.jar
1
2
build.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
build.xml
Simple merge
git://source.jalview.org / jalview.git / commitdiff