[LyX/2.3.x] Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

2018-04-28 Thread José Matos 
commit 0a43aac52474e5b316df9b3679b771fa4c98839c
Merge: f7b9d57 1084e30
Author: José Matos 
Date:   Sat Apr 28 11:26:16 2018 +0100

Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

[LyX/2.3.x] Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

2018-03-18 Thread Juergen Spitzmueller 
commit 43e5594dfd18e9037b2358f2c6e2cad5cbec1c0a
Merge: 935aba0 b22c640
Author: Juergen Spitzmueller 
Date:   Sun Mar 18 10:00:21 2018 +0100

Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

 po/fr.gmo |  Bin 542418 -> 542880 bytes
 po/fr.po  |   16 +++-
 2 files changed, 7 insertions(+), 9 deletions(-)

[LyX/2.3.x] Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

2018-02-12 Thread Uwe Stöhr 
commit d1ac023b505e4d0acfb92ba785f57d7ccd72f097
Merge: 9006045 db1c123
Author: Uwe Stöhr 
Date:   Mon Feb 12 19:04:25 2018 +0100

Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

 lib/Makefile.am |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[LyX/2.3.x] Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

2017-12-14 Thread Uwe Stöhr 
commit a0130c343b9410b52811fb8aa7fb06bd346badc2
Merge: f97dd4f cab1d12
Author: Uwe Stöhr 
Date:   Thu Dec 14 14:49:16 2017 +0100

Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

 po/de.gmo |  Bin 539574 -> 540058 bytes
 po/de.po  |   12 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

[LyX/2.3.x] Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

2017-09-10 Thread Uwe Stöhr 
commit c7ec2f907cc7faace6343c459d62f7937b09ece9
Merge: 78221d4 0b6207d
Author: Uwe Stöhr 
Date:   Sun Sep 10 17:06:00 2017 +0200

Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

 lib/doc/Customization.lyx|  284 +++-
 lib/doc/de/Customization.lyx | 3896 +++---
 lib/scripts/svg2pdftex.py|6 +-
 lib/scripts/svg2pstex.py |7 +-
 4 files changed, 2033 insertions(+), 2160 deletions(-)