Merge branch 'master' of git.lyx.org:lyx

diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module
index 1f0a7c771c6f7615e12fb98b6fd221fa6f86eab6..4ab191b999c74e8b052c6875cd7a7f64c3d6f8f4 100644 (file)
--- a/lib/layouts/enumitem.module
+++ b/lib/layouts/enumitem.module
@@ -3,6 +3,8 @@
 # Controls the layout of enumerate, itemize, description, and list/labeling.
 # See section Customized Lists of the User's Guide for a detailed description.
 #DescriptionEnd
+#Excludes: paralist
+
 # Author: Günter Milde <milde@users.berlios.de>
 # 
 # 2008-12-04 first published version.

diff --git a/lib/layouts/paralist.module b/lib/layouts/paralist.module
index 3083440b4860c1ed87479ff976355f3f59581ace..61a1384b659f83b94665b3d9f39dbb304a6d2d49 100644 (file)
--- a/lib/layouts/paralist.module
+++ b/lib/layouts/paralist.module
@@ -6,13 +6,13 @@
 # arguments to format the labels. Additionally, the LaTeX environments
 # itemize and enumerate are extended to use a similar optional argument.
 #DescriptionEnd
+#Excludes: enumitem
+
 # Author: Georg Baum <baum@lyx.org>
 # (structuring taken from enumitem.module by Günter Milde)
 
 Format 59
 
-ExcludesModule enumitem
-
 AddToPreamble
        \usepackage{paralist}
 EndPreamble