mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Merge remote-tracking branch 'origin/master' into features/latexargs
Conflicts: src/Text3.cpp
This commit is contained in:
commit
b95c17cfdd
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user