From: Juergen Spitzmueller <spitz@lyx.org>
Date: Tue, 20 Nov 2012 17:11:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into features/latexargs
X-Git-Tag: 2.1.0beta1~1235
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b95c17cfdd469aac842304073a56e3fb64bfe629;hp=99e611b2d8cf78fada22e38dbc6684ce0f76f092;p=features.git

Merge remote-tracking branch 'origin/master' into features/latexargs

Conflicts:
	src/Text3.cpp
---

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 47e1e7bf1a..68ce15d5d7 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -550,7 +550,7 @@ void LyXAction::init()
  * \li Origin: spitz, 05 Mar 2012
  * \endvar
  */
-        { LFUN_IPA_INSERT, "ipa-insert", Noop, Edit },
+		{ LFUN_IPA_INSERT, "ipa-insert", Noop, Edit },
 /*!
  * \var lyx::FuncCode lyx::LFUN_IN_IPA
  * \li Action: Only active in IPA inset.