Merge branch 'master' into resize

This commit is contained in:
James Booth
2012-04-20 00:57:00 +01:00
10 changed files with 280 additions and 12 deletions

View File

@@ -65,6 +65,7 @@ void win_contact_online(const char * const from, const char * const show,
const char * const status);
void win_contact_offline(const char * const from, const char * const show,
const char * const status);
void win_disconnected(void);
// console window actions
void cons_help(void);
@@ -85,6 +86,7 @@ void status_bar_get_password(void);
void status_bar_print_message(const char * const msg);
void status_bar_inactive(const int win);
void status_bar_active(const int win);
void status_bar_new(const int win);
void status_bar_update_time(void);
// input window actions