From: Scott Kostyshak <skostysh@lyx.org>
Date: Mon, 15 Jan 2018 22:01:28 +0000 (-0500)
Subject: Merge branch 'ja_knitr_sweave_updates'
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~4012
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=299b730318137e01e74ed95353cfc6ef00839612;p=features.git

Merge branch 'ja_knitr_sweave_updates'

This merges updates from Koji Yokota, and adapts the ctests
accordingly.
---

299b730318137e01e74ed95353cfc6ef00839612