* Doxy.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25535 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 5751520b0872b5789a3d6094aab3f04e6b871660..466398643bc986c5911ccd6a5e8639b7f54b6d0d 100644 (file)
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -1868,6 +1868,14 @@ void LyXAction::init()
  * \endvar
  */
                { LFUN_CHANGE_NEXT, "change-next", ReadOnly, Edit },
+/*!
+ * \var lyx::FuncCode lyx::LFUN_CHANGES_MERGE
+ * \li Action: Open change tracking dialog for merging and moves the cursor
+               to the position of the next change.
+ * \li Syntax: changes-merge
+ * \li Origin: Levon, 16 Oct 2002
+ * \endvar
+ */
                { LFUN_CHANGES_MERGE, "changes-merge", Noop, Edit },
                { LFUN_CHANGE_ACCEPT, "change-accept", Noop, Edit },
                { LFUN_CHANGE_REJECT, "change-reject", Noop, Edit },