diff options
author | James Booth <boothj5@gmail.com> | 2013-11-11 20:51:35 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2013-11-11 20:51:35 +0000 |
commit | 8c97658b8d1f7a10f146e33ca3dc5a7ff2aa3527 (patch) | |
tree | bd88eee2f2138e2d1cf5f5b52c7bb27972e0e75e /src/profanity.h | |
parent | 3e86d108a314a067589e32b60d2f6374eae501b6 (diff) | |
parent | c5f76721ce9d10b127d54e127ac34e555c749465 (diff) | |
download | profani-tty-8c97658b8d1f7a10f146e33ca3dc5a7ff2aa3527.tar.gz |
Merge branch 'master' into refactor2
Conflicts: src/ui/core.c
Diffstat (limited to 'src/profanity.h')
-rw-r--r-- | src/profanity.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/profanity.h b/src/profanity.h index 0cd59fd0..3dac6c3e 100644 --- a/src/profanity.h +++ b/src/profanity.h @@ -26,7 +26,7 @@ #include "resource.h" #include "xmpp/xmpp.h" -void prof_run(const int disable_tls, char *log_level); +void prof_run(const int disable_tls, char *log_level, char *account_name); void prof_handle_login_success(const char *jid, const char *altdomain); void prof_handle_login_account_success(char *account_name); |