The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit c97f75da03d5c752199e3a886acf79a3d2f7add0 Merge: e10bfe5 ba0454f Author: Juergen Spitzmueller <[email protected]> Date: Mon Oct 15 15:56:25 2012 +0200 Do not inherit Provides from beamer diff --cc status.20x index 31f9366,f688546..42cf0d6 --- a/status.20x +++ b/status.20x @@@ -147,9 -147,9 +147,12 @@@ What's ne - Fix failure of lyxknitr.R to move files when /tmp was on a different file system (e.g. an encrypted home partition). +- Do not suppress the loading of geometry and hyperref if the class + "article (koma + beamer)". + + - Removed unnecessary dependency on the package europs.sty from the + g-brief layout files. + * USER INTERFACE commit e10bfe585709d1d4b1a0a2f7973106ce9642d48d Author: Juergen Spitzmueller <[email protected]> Date: Mon Oct 15 15:53:28 2012 +0200 Do not inherit Provides from beamer diff --git a/lib/layouts/scrarticle-beamer.layout b/lib/layouts/scrarticle-beamer.layout index f1b6d43..e8463a0 100644 --- a/lib/layouts/scrarticle-beamer.layout +++ b/lib/layouts/scrarticle-beamer.layout @@ -7,6 +7,10 @@ Format 35 # Includes Input beamer.layout +# override settings inherited from beamer.layout +Provides geometry 0 +Provides hyperref 0 + Preamble \usepackage{beamerarticle,pgf} % this default might be overridden by plain title style diff --git a/status.20x b/status.20x index 1979ea2..31f9366 100644 --- a/status.20x +++ b/status.20x @@ -147,6 +147,9 @@ What's new - Fix failure of lyxknitr.R to move files when /tmp was on a different file system (e.g. an encrypted home partition). +- Do not suppress the loading of geometry and hyperref if the class + "article (koma + beamer)". + * USER INTERFACE ----------------------------------------------------------------------- Summary of changes: lib/layouts/scrarticle-beamer.layout | 4 ++++ status.20x | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
