Merge of xorg-modular grimoire into a devel- branch in the main

grimoire. This merge in effect deprecates xorg-modular grimoire
and make this the running head of it. All commits to -modular should
now go through this branch.

Merge commit 'xorg-modular/master' into devel-xorg-modular

Conflicts:

	.gitignore
	excluded
	gurus.gpg
	libcompat
	libgcc
	volatiles

1 files changed, 0 insertions, 1 deletions

diff --git a/libcompat b/libcompat
index e99926bd7c..7f3b5530c2 100755
--- a/libcompat
+++ b/libcompat
@@ -69,4 +69,3 @@ function is_depends_enabled() {
   grep -q "^[[:space:]]*$1:$2:on" $dep_status
 }
 
-