From: <ez...@us...> - 2013-09-23 23:29:23
|
Revision: 23209 http://jedit.svn.sourceforge.net/jedit/?rev=23209&view=rev Author: ezust Date: 2013-09-23 23:29:17 +0000 (Mon, 23 Sep 2013) Log Message: ----------- reverting previous conflict Modified Paths: -------------- jEdit/trunk/keymaps/Mac_OS_X_keys.props Modified: jEdit/trunk/keymaps/Mac_OS_X_keys.props =================================================================== --- jEdit/trunk/keymaps/Mac_OS_X_keys.props 2013-09-23 23:12:13 UTC (rev 23208) +++ jEdit/trunk/keymaps/Mac_OS_X_keys.props 2013-09-23 23:29:17 UTC (rev 23209) @@ -109,7 +109,7 @@ prev-word.shortcut=M+LEFT print.shortcut=C+p quick-search-word.shortcut=A+COMMA -quick-search.shortcut=C+BACK_SLASH +quick-search.shortcut=C+COMMA range-comment.shortcut=C+SLASH recent-buffer.shortcut=C+BACK_QUOTE record-macro.shortcut=AM+r This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |