aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2015-09-09 23:03:34 +01:00
commit c42921cb92
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/command/command.c
View File

@ -1478,7 +1478,7 @@ static struct cmd_t command_defs[] =
cmd_prefs, parse_args, 0, 1, NULL, cmd_prefs, parse_args, 0, 1, NULL,
CMD_NOTAGS CMD_NOTAGS
CMD_SYN( CMD_SYN(
"/prefs [ui|desktop|chat|log|conn|presence]") "/prefs [ui|desktop|chat|log|conn|presence|otr|pgp]")
CMD_DESC( CMD_DESC(
"Show preferences for different areas of functionality. " "Show preferences for different areas of functionality. "
"Passing no arguments shows all preferences.") "Passing no arguments shows all preferences.")
@ -1488,7 +1488,9 @@ static struct cmd_t command_defs[] =
{ "chat", "Chat state preferences." }, { "chat", "Chat state preferences." },
{ "log", "Logging preferences." }, { "log", "Logging preferences." },
{ "conn", "Connection handling preferences." }, { "conn", "Connection handling preferences." },
{ "presence", "Chat presence preferences." }) { "presence", "Chat presence preferences." },
{ "otr", "Off The Record preferences." },
{ "pgp", "OpenPGP preferences." })
CMD_NOEXAMPLES CMD_NOEXAMPLES
}, },