git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b2ca36 977eba6)
Merge branch 'bug/JAL-1643_File-chooser-improvement' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Feb 2015 10:59:33 +0000 (10:59 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Feb 2015 10:59:33 +0000 (10:59 +0000)
Conflicts:
.classpath

1  2 
.classpath patch | diff1 | diff2 | blob | history
utils/InstallAnywhere/Jalview.iap_xml patch | diff1 | diff2 | blob | history

diff --cc .classpath
Simple merge
diff --cc utils/InstallAnywhere/Jalview.iap_xml
Simple merge