1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-09 22:46:44 +02:00

Merge branch 'master' of https://github.com/stqism/ProjectTox-Core into pull-requests

Conflicts:
	testing/toxic/prompt.c
This commit is contained in:
irungentoo
2013-08-07 18:20:36 -04:00
3 changed files with 12 additions and 2 deletions

1
chat.c
View File

@ -57,7 +57,6 @@ static void chat_onMessage(ToxWindow *self, int num, uint8_t *msg, uint16_t len)
self->blink = true;
beep();
flash();
}
static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t len)