1
0
mirror of https://github.com/Tha14/toxic.git synced 2026-01-30 06:03:16 +01:00

merge with master (new api)

This commit is contained in:
Jfreegman
2015-03-30 21:46:25 -04:00
parent 23429d8da4
commit ee074f334e
38 changed files with 1710 additions and 1726 deletions

View File

@@ -67,7 +67,7 @@ struct user_settings {
int key_toggle_peerlist;
int mplex_away; /* boolean (1 for reaction to terminal attach/detach) */
char mplex_away_note [TOX_MAX_STATUSMESSAGE_LENGTH];
char mplex_away_note [TOX_MAX_STATUS_MESSAGE_LENGTH];
#ifdef AUDIO
int audio_in_dev;