diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-31 12:44:52 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-31 12:44:52 +0100 |
commit | 4c59a3c58b873440573cd29eee0ead6f7dd78fcf (patch) | |
tree | 14f6422e9d9f5e8061063c9f8fda8972fb702037 /nx-X11/programs/Xserver/GL/mesa/shader/slang | |
parent | 6b3080d547ff63c9d6d8e08d9133c4e47d98ed39 (diff) | |
parent | fcf61d3411bc1868e53305a3777f4bcaab3eb4bd (diff) | |
download | nx-libs-4c59a3c58b873440573cd29eee0ead6f7dd78fcf.tar.gz nx-libs-4c59a3c58b873440573cd29eee0ead6f7dd78fcf.tar.bz2 nx-libs-4c59a3c58b873440573cd29eee0ead6f7dd78fcf.zip |
Merge branch 'sunweaver-pr/clean-up-old-vcs-comments' into 3.6.x
Attributes GH PR #254: https://github.com/ArcticaProject/nx-libs/pull/254
Diffstat (limited to 'nx-X11/programs/Xserver/GL/mesa/shader/slang')
-rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc index 4358b8975..4ffa7805f 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86$ - MESASLANGBUILDDIR=MesaSlangBuildDir MESA_SLANG_SRCS = $(MESASLANGBUILDDIR)slang_assemble_assignment.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc index 3489b7a28..06b530063 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86:$ - #ifdef NeedToLinkMesaSrc LinkSourceFile(slang_common_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) LinkSourceFile(slang_common_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) |