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

Merge branch 'master' into osx-functional

This commit is contained in:
James Booth 2015-11-08 22:45:38 +00:00
commit ba9e3a1832

View File

@ -996,10 +996,11 @@ static struct cmd_t command_defs[] =
{ "statusbar off", "Do not show time in status bar." }, { "statusbar off", "Do not show time in status bar." },
{ "lastactivity set <format>", "Change time format for last activity." }) { "lastactivity set <format>", "Change time format for last activity." })
CMD_EXAMPLES( CMD_EXAMPLES(
"/time main set \"%d-%m-%y %H:%M\"", "/time console set %H:%M:%S",
"/time main off", "/time chat set \"%d-%m-%y %H:%M:%S\"",
"/time xml off",
"/time statusbar set %H:%M", "/time statusbar set %H:%M",
"/time lastactivity set \"%d-%m-%y %H:%M\"") "/time lastactivity set \"%d-%m-%y %H:%M:%S\"")
}, },
{ "/inpblock", { "/inpblock",