[LyX/master] fix merged build

commit 936ec661247e0997fbedbb9a6bab5ba7e19f2715 Author: Peter Kümmel Date: Wed Jan 6 12:55:12 2016 +0100 fix merged build diff --git a/src/TextClass.h b/src/TextClass.h index 94fe003..a6ffed9 100644 --- a/src/TextClass.h +++ b/src/TextClass.h @@ -30,6 +30,10 @@ #include

[LyX/2.1.x] more flexible Xcode management, reduce hard coded version numbers

commit 10831da1710c92d6af40dd9b21f88be97e7cb4e7 Author: Stephan Witt Date: Wed Jan 6 10:38:26 2016 +0100 more flexible Xcode management, reduce hard coded version numbers diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh index

[LyX/2.1.x] correct the error message for not supported automake version

commit f9d381c5c490a1e0ab28c8a337ce3948999f3522 Author: Stephan Witt Date: Wed Jan 6 10:34:54 2016 +0100 correct the error message for not supported automake version diff --git a/autogen.sh b/autogen.sh index 85652c0..b58c27b 100755 --- a/autogen.sh +++ b/autogen.sh @@

[LyX/master] more flexible Xcode management, reduce hard coded version numbers

commit c098ee0c721fe2613b2a56c86e6e4537ca47e35a Author: Stephan Witt Date: Wed Jan 6 10:14:39 2016 +0100 more flexible Xcode management, reduce hard coded version numbers diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh index

[LyX/master] also install cross compiled lyx

commit ff8719497af2629d002723a17e2379e4cf645925 Author: Peter Kümmel Date: Wed Jan 6 14:24:22 2016 +0100 also install cross compiled lyx diff --git a/development/cmake/scripts/xmingw b/development/cmake/scripts/xmingw index 517291d..f08c1e7 100755 ---

[LyX/master] ctests: next round of sorting.

commit 1fdab5e0385d4789baa65cc8fef23fc7da31d973 Author: Günter Milde Date: Wed Jan 6 14:51:02 2016 +0100 ctests: next round of sorting. diff --git a/development/autotests/suspiciousTests b/development/autotests/suspiciousTests index 0410b45..d0875dd 100644 ---

[LyX/master] ctests: solve one todo item.

commit 15ffc2b01ca60e62893a00faff6c10c1738ef377 Author: Günter Milde Date: Wed Jan 6 14:58:38 2016 +0100 ctests: solve one todo item. diff --git a/development/autotests/suspiciousTests b/development/autotests/suspiciousTests index d0875dd..f5db707 100644 ---

[LyX/master] Add symbol tests for A WITH RING ABOVE

commit ac1cd1ad9acb4f188e21a8da225fc8f3468ee0e9 Author: Georg Baum Date: Wed Jan 6 22:34:12 2016 +0100 Add symbol tests for A WITH RING ABOVE The conversion is not completely correct yet, but adding the test before the fix has the advantage that the fix can