summaryrefslogtreecommitdiffstats
path: root/smgl
diff options
context:
space:
mode:
authorFlorian Franzmann2020-01-18 11:13:26 +0100
committerFlorian Franzmann2020-01-18 11:13:26 +0100
commit655d18b9aaac6ab4f620041d6418b4400cd30a37 (patch)
tree47e481bf688ba95192a919fa317d4faaa51bc210 /smgl
parent8f705b5107d7a23c076cd957746cbd4adc0eae5e (diff)
smgl/smgl-gl_select: add conflict with libglvnd
Diffstat (limited to 'smgl')
-rwxr-xr-xsmgl/smgl-gl_select/CONFLICTS1
-rw-r--r--smgl/smgl-gl_select/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/smgl/smgl-gl_select/CONFLICTS b/smgl/smgl-gl_select/CONFLICTS
new file mode 100755
index 0000000000..c4cc50d741
--- /dev/null
+++ b/smgl/smgl-gl_select/CONFLICTS
@@ -0,0 +1 @@
+conflicts libglvnd
diff --git a/smgl/smgl-gl_select/HISTORY b/smgl/smgl-gl_select/HISTORY
index 0d6cec70f4..386ec3f285 100644
--- a/smgl/smgl-gl_select/HISTORY
+++ b/smgl/smgl-gl_select/HISTORY
@@ -1,3 +1,6 @@
+2020-01-18 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * CONFLICS: conflicts with libglvnd
+
2015-03-23 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS: version 2.0.5
* smgl-gl_select: Don't link .la files, avoiding hardwiring of