git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e58d21a 5327042)
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 1 Nov 2018 11:33:44 +0000 (11:33 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 1 Nov 2018 11:33:44 +0000 (11:33 +0000)
https://source.jalview.org/git/jalview.git into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
swingjs/timestamp

1  2 
swingjs/timestamp patch | diff1 | diff2 | blob | history

diff --cc swingjs/timestamp
index 854d7fa,170a61e..02f774c
--- 1/swingjs/timestamp
--- 2/swingjs/timestamp
+++ b/swingjs/timestamp
@@@ -1,1 -1,5 +1,1 @@@
- 20181030183630
 -<<<<<<< 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)
++20181101060953