commit 616c7b9272a8b49de9a3cba2bda860e651b00f76
Author: Juergen Spitzmueller sp...@lyx.org
Date: Sat Jul 25 10:15:44 2015 +0200
Resolve shortcut conflict
diff --git a/lib/configure.py b/lib/configure.py
index 1554ee5..91f5593 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -688,7
commit 969ab7294ac92c0bcc28125df177c9396c65ff96
Author: Pavel Sanda sa...@lyx.org
Date: Sat Jul 25 11:03:50 2015 -0700
nb layout translations reviewed by Helge.
diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review
index 7265cd6..dcc225f 100644
---
commit dc402db1132e2cbdbd984c7d4783f996a0f7771d
Author: Richard Heck rgh...@lyx.org
Date: Sat Jul 25 15:30:39 2015 -0400
Start 2.1.5 development.
diff --git a/configure.ac b/configure.ac
index 2b66479..9fe824c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
dnl Process with
commit 9f777d4bfb711f3fa6daa8d61eb071d365b5d076
Author: Juergen Spitzmueller sp...@lyx.org
Date: Sat Jul 25 12:48:13 2015 +0200
Do not attempt to select an empty cell before inserting a longtable caption
Fixes: #9692
diff --git a/src/insets/InsetTabular.cpp
commit 616c7b9272a8b49de9a3cba2bda860e651b00f76
Author: Juergen Spitzmueller
Date: Sat Jul 25 10:15:44 2015 +0200
Resolve shortcut conflict
diff --git a/lib/configure.py b/lib/configure.py
index 1554ee5..91f5593 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -688,7
commit 9f777d4bfb711f3fa6daa8d61eb071d365b5d076
Author: Juergen Spitzmueller
Date: Sat Jul 25 12:48:13 2015 +0200
Do not attempt to select an empty cell before inserting a longtable caption
Fixes: #9692
diff --git a/src/insets/InsetTabular.cpp
commit 969ab7294ac92c0bcc28125df177c9396c65ff96
Author: Pavel Sanda
Date: Sat Jul 25 11:03:50 2015 -0700
nb layout translations reviewed by Helge.
diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review
index 7265cd6..dcc225f 100644
---
commit dc402db1132e2cbdbd984c7d4783f996a0f7771d
Author: Richard Heck
Date: Sat Jul 25 15:30:39 2015 -0400
Start 2.1.5 development.
diff --git a/configure.ac b/configure.ac
index 2b66479..9fe824c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
dnl Process with