The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 1406b0e638852b2050bac9353fc7f7b9aa88bea9
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Mon Oct 15 08:33:36 2012 +0200
Do not inherit Provides from beamer
Also branch candidate.
diff --git a/lib/layouts/article-beamer.layout
b/lib/layouts/article-beamer.layout
index 4ac83b3..dd13800 100644
--- a/lib/layouts/article-beamer.layout
+++ b/lib/layouts/article-beamer.layout
@@ -11,6 +11,8 @@ Input beamer.layout
# override settings inherited from beamer.layout (Paul Rubin <ru...@msu.edu>)
Provides geometry 0
Provides hyperref 0
+Provides color 0
+Provides xcolor 0
Preamble
\usepackage{beamerarticle,pgf}
diff --git a/lib/layouts/scrarticle-beamer.layout
b/lib/layouts/scrarticle-beamer.layout
index bcaf130..ab154e2 100644
--- a/lib/layouts/scrarticle-beamer.layout
+++ b/lib/layouts/scrarticle-beamer.layout
@@ -8,6 +8,12 @@ Format 40
# Includes
Input beamer.layout
+# override settings inherited from beamer.layout
+Provides geometry 0
+Provides hyperref 0
+Provides color 0
+Provides xcolor 0
+
Preamble
\usepackage{beamerarticle,pgf}
% this default might be overridden by plain title style
-----------------------------------------------------------------------
Summary of changes:
lib/layouts/article-beamer.layout | 2 ++
lib/layouts/scrarticle-beamer.layout | 6 ++++++
2 files changed, 8 insertions(+), 0 deletions(-)
hooks/post-receive
--
The LyX Source Repository
