git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a388a0 1114d77)
Merge branch 'Jalview-BH/JAL-3026' of
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 21 Aug 2018 18:30:37 +0000 (13:30 -0500)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 21 Aug 2018 18:30:37 +0000 (13:30 -0500)
https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026

Conflicts:
swingjs/SwingJS-site.zip
swingjs/timestamp
swingjs/ver/3.2.2/SwingJS-site.zip
swingjs/ver/3.2.2/timestamp

1  2 
swingjs/SwingJS-site.zip patch | diff1 | diff2 | blob | history
swingjs/timestamp patch | diff1 | diff2 | blob | history
swingjs/ver/3.2.2/SwingJS-site.zip patch | diff1 | diff2 | blob | history
swingjs/ver/3.2.2/timestamp patch | diff1 | diff2 | blob | history

diff --cc swingjs/SwingJS-site.zip
index 1d44e0d,11c50c2..e69de29
Binary files differ
diff --cc swingjs/timestamp
index 6f6c035,0e6d94b..eff8cd0
--- 1/swingjs/timestamp
--- 2/swingjs/timestamp
+++ b/swingjs/timestamp
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +20180821132825 
++=======
+ 20180821131949 
++>>>>>>> branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git
diff --cc swingjs/ver/3.2.2/SwingJS-site.zip
index 1d44e0d,11c50c2..e69de29
Binary files differ
diff --cc swingjs/ver/3.2.2/timestamp
index 6f6c035,0e6d94b..eff8cd0
--- 1/swingjs/ver/3.2.2/timestamp
--- 2/swingjs/ver/3.2.2/timestamp
+++ b/swingjs/ver/3.2.2/timestamp
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +20180821132825 
++=======
+ 20180821131949 
++>>>>>>> branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git