git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
update, including a new transpiler along with all changes working on
[jalview.git]
/
swingjs
/
timestamp
diff --git
a/swingjs/timestamp
b/swingjs/timestamp
index
170a61e
..
ae1eaa7
100644
(file)
--- a/
swingjs/timestamp
+++ b/
swingjs/timestamp
@@
-1,5
+1
@@
-<<<<<<< Upstream, based on branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
-20181030183630
-=======
-20181101060953
->>>>>>> 8398157 JAXB upgrade for package-info namespace (only)
+20190323074004