[LyX/master] sweave.lyx: accept changes

2017-10-26 Thread Uwe Stöhr
commit 4864250a115103e0e73188876d5c59d5cfa2b14f Author: Uwe Stöhr Date: Fri Oct 27 00:15:49 2017 +0200 sweave.lyx: accept changes --- lib/examples/ja/sweave.lyx | 15 --- lib/examples/sweave.lyx| 32 ++-- 2 files changed,

[LyX/2.3.x] sweave.lyx: accept changes

2017-10-26 Thread Uwe Stöhr
commit a7f561f571b624afb357d468b28e88f9b5cfc37e Author: Uwe Stöhr Date: Fri Oct 27 00:14:00 2017 +0200 sweave.lyx: accept changes - also correct 2 file paths in Japanese EmbeddedObjects.lyx --- lib/doc/ja/EmbeddedObjects.lyx |4 ++--

[LyX/master] Cmake export tests: Add the die-message to the diestack() param.

2017-10-26 Thread Kornel Benko
commit 6720a8ca7c726f5b76f89a441f69961228bd6313 Author: Kornel Benko Date: Thu Oct 26 22:43:24 2017 +0200 Cmake export tests: Add the die-message to the diestack() param. Spotted by Scott. --- development/autotests/useSystemFonts.pl |3 +-- 1 files changed, 1

[LyX/master] Fix remaining path

2017-10-26 Thread Kornel Benko
commit d5ec6356b844026ef65276dd022296baffe10111 Author: Kornel Benko Date: Thu Oct 26 21:53:39 2017 +0200 Fix remaining path --- lib/doc/ja/EmbeddedObjects.lyx |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/doc/ja/EmbeddedObjects.lyx