Merge branch 'master' into refactor2

Conflicts:
	src/ui/core.c
This commit is contained in:
James Booth
2013-11-11 20:51:35 +00:00
16 changed files with 139 additions and 31 deletions

View File

@@ -216,6 +216,7 @@ void cons_autoaway_setting(void);
void cons_reconnect_setting(void);
void cons_autoping_setting(void);
void cons_priority_setting(void);
void cons_autoconnect_setting(void);
// status bar actions
void status_bar_refresh(void);