anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/Text3.cpp
This commit is contained in:
Juergen Spitzmueller 2012-11-20 18:11:14 +01:00
commit b95c17cfdd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/LyXAction.cpp
View File

@ -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.