[LyX/master] Fix perf issues and crash when showing 1'100'000 items (#9968)

2016-03-10 Thread Guillaume Munch
commit b3bed2927ea41297a8ca641e39112528fc179163 Author: Guillaume Munch Date: Thu Mar 10 01:08:51 2016 + Fix perf issues and crash when showing 1'100'000 items (#9968) diff --git a/src/frontends/qt4/GuiSymbols.cpp b/src/frontends/qt4/GuiSymbols.cpp index dad0211..5032e51 100644 --- a/s

[LyX/2.1.x] Amend 13a993fd

2016-03-10 Thread Guillaume Munch
commit 17fa787ba2b293e70c7add12f3a19092812127a5 Author: Guillaume Munch Date: Fri Mar 11 01:09:10 2016 + Amend 13a993fd Correctly backport other changes. diff --git a/src/frontends/qt4/GuiSymbols.cpp b/src/frontends/qt4/GuiSymbols.cpp index 80d0648..87e26b2 100644 --- a/src/fr

[LyX/2.1.x] Fix perf issues and crash when showing 1'100'000 items (#9968)

2016-03-10 Thread Guillaume Munch
commit 13a993fda825dd4f85725128988b1d646305c19d Author: Guillaume Munch Date: Thu Mar 10 01:08:51 2016 + Fix perf issues and crash when showing 1'100'000 items (#9968) diff --git a/src/frontends/qt4/GuiSymbols.cpp b/src/frontends/qt4/GuiSymbols.cpp index ecaf165..80d0648 100644 --- a/s

[LyX/master] Fix xcolor use with *-beamer.layout

2016-03-10 Thread Scott Kostyshak
commit 97521c4ec4cdb70e08cb4fe8ff4743baede25218 Author: Scott Kostyshak Date: Thu Mar 10 16:45:32 2016 -0500 Fix xcolor use with *-beamer.layout This commit fixes the minimal example of using e.g. purple text in article-beamer. Patch from Jürgen. See discussion here:

[LyX/master] Fix dist target when configured with monolithic build.

2016-03-10 Thread Jean-Marc Lasgouttes
commit 31eba79b09006fb2f8a351500f6005a56a7973e0 Author: Jean-Marc Lasgouttes Date: Wed Mar 9 10:52:16 2016 +0100 Fix dist target when configured with monolithic build. diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am index 6a46c5e..1c693e4 100644 --- a/src/fronten

[LyX/master] Reset right_boundary row property when row is shortened

2016-03-10 Thread Jean-Marc Lasgouttes
commit 5f9053d6d34188d64803e1c30255a7f1a6901373 Author: Jean-Marc Lasgouttes Date: Mon Mar 7 13:46:13 2016 +0100 Reset right_boundary row property when row is shortened Fixes bug #10003. diff --git a/src/Row.cpp b/src/Row.cpp index 6e51fb1..8af6fa9 100644 --- a/src/Row.cpp +++ b/s