diff options
| author | irungentoo <irungentoo@gmail.com> | 2013-08-07 18:20:36 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2013-08-07 18:20:36 -0400 |
| commit | 00ecb05c1b36bc678fc880a12e71ebf407589216 (patch) | |
| tree | c75476f7c1b94e24501805c93001382d0a8b0a0d /testing/toxic/chat.c | |
| parent | 4dbcfdf05dfc9127d2356d68399f91366db8b645 (diff) | |
| parent | 3622a5c04c27d28ac7c83d629fea77248f8e709e (diff) | |
Merge branch 'master' of https://github.com/stqism/ProjectTox-Core into pull-requests
Conflicts:
testing/toxic/prompt.c
Diffstat (limited to 'testing/toxic/chat.c')
| -rw-r--r-- | testing/toxic/chat.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c index bd213131..b870e9c2 100644 --- a/testing/toxic/chat.c +++ b/testing/toxic/chat.c | |||
| @@ -57,7 +57,6 @@ static void chat_onMessage(ToxWindow *self, int num, uint8_t *msg, uint16_t len) | |||
| 57 | 57 | ||
| 58 | self->blink = true; | 58 | self->blink = true; |
| 59 | beep(); | 59 | beep(); |
| 60 | flash(); | ||
| 61 | } | 60 | } |
| 62 | 61 | ||
| 63 | static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t len) | 62 | static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t len) |