git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: a5af7a3)
JAL-3026 GD #118 tooltip not showing for components.
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 21 Aug 2018 18:36:43 +0000 (13:36 -0500)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 21 Aug 2018 19:28:33 +0000 (14:28 -0500)
swingjs/SwingJS-site.zip patch | blob | history
swingjs/timestamp patch | blob | history
swingjs/ver/3.2.2/SwingJS-site.zip patch | blob | history
swingjs/ver/3.2.2/timestamp patch | blob | history

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index e69de29..b89e608 100644 (file)
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/timestamp b/swingjs/timestamp
index eff8cd0..7770012 100644 (file)
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20180821132825 
-=======
-20180821131949 
->>>>>>> branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git
+20180821142509 
diff --git a/swingjs/ver/3.2.2/SwingJS-site.zip b/swingjs/ver/3.2.2/SwingJS-site.zip
index e69de29..b89e608 100644 (file)
Binary files a/swingjs/ver/3.2.2/SwingJS-site.zip and b/swingjs/ver/3.2.2/SwingJS-site.zip differ
diff --git a/swingjs/ver/3.2.2/timestamp b/swingjs/ver/3.2.2/timestamp
index eff8cd0..7770012 100644 (file)
--- a/swingjs/ver/3.2.2/timestamp
+++ b/swingjs/ver/3.2.2/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20180821132825 
-=======
-20180821131949 
->>>>>>> branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git
+20180821142509