diff options
author | James Booth <boothj5@gmail.com> | 2012-07-29 02:20:05 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2012-07-29 02:20:05 +0100 |
commit | a0cb58bb1cbc043c4c97c4409e491cc653503e0f (patch) | |
tree | 1926bc0e209e1d34163ae47351f43a2cf1483b56 /src/windows.c | |
parent | c738966d74899dc4aa81799690effb204db6675e (diff) | |
parent | f58d8a2d22f3e5bdc5e67f1c4a3c4abdf5d0ad8c (diff) | |
download | profani-tty-a0cb58bb1cbc043c4c97c4409e491cc653503e0f.tar.gz |
Merge branch 'tinyurl'
Conflicts: src/command.c
Diffstat (limited to 'src/windows.c')
-rw-r--r-- | src/windows.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/windows.c b/src/windows.c index a28bdbc6..c2d2294b 100644 --- a/src/windows.c +++ b/src/windows.c @@ -34,6 +34,7 @@ #include "util.h" #include "contact.h" #include "preferences.h" +#include "tinyurl.h" #define CONS_WIN_TITLE "_cons" #define PAD_SIZE 200 @@ -361,6 +362,7 @@ cons_help(void) cons_show("/prefs : Show current UI preferences."); cons_show("/connect user@host : Login to jabber."); cons_show("/msg user@host mesg : Send mesg to user."); + cons_show("/tiny user@host url : Send url as tinyurl"); cons_show("/close : Close a chat window."); cons_show("/who : Find out who is online."); cons_show("/ros : List all contacts."); |