diff options
| author | Remko van der Vossen | 2019-05-31 13:58:59 +0200 |
|---|---|---|
| committer | Remko van der Vossen | 2020-02-23 12:17:52 +0100 |
| commit | 7dd12ef253cb3c962fd34e14c64f2a8fc7ca12ce (patch) | |
| tree | 6efb944b3a582bb672685d3e48d54da76bdc49c8 /bin-java | |
| parent | a74c1942c6901b0fcfa7e284db487ff3a81f44c2 (diff) | |
openjdk12-bin: conflicts openjdk12
Diffstat (limited to 'bin-java')
| -rwxr-xr-x | bin-java/openjdk12-bin/CONFLICTS | 1 | ||||
| -rw-r--r-- | bin-java/openjdk12-bin/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/bin-java/openjdk12-bin/CONFLICTS b/bin-java/openjdk12-bin/CONFLICTS index 75fb170..eee4298 100755 --- a/bin-java/openjdk12-bin/CONFLICTS +++ b/bin-java/openjdk12-bin/CONFLICTS @@ -8,4 +8,5 @@ conflicts jre1.5-bin && conflicts jre6-bin && conflicts jre7-bin && conflicts jre8-bin && +conflicts openjdk12 && conflicts server-jre8-bin diff --git a/bin-java/openjdk12-bin/HISTORY b/bin-java/openjdk12-bin/HISTORY index 30f338c..81d12ff 100644 --- a/bin-java/openjdk12-bin/HISTORY +++ b/bin-java/openjdk12-bin/HISTORY @@ -3,5 +3,8 @@ Sorcery devel (from git), glibc, gcc, or updated smgl-archspecs changed SMGL_COMPAT_ARCHS[1] from x86_64 to em64t. +2019-05-31 Remko van der Vossen <wich@sourcemage.org> + * CONFLICTS: conflicts openjdk12 + 2019-05-25 Remko van der Vossen <wich@sourcemage.org> * Created spell |