diff options
| author | irungentoo <irungentoo@gmail.com> | 2013-08-06 10:16:26 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2013-08-06 10:16:26 -0400 |
| commit | eacd12385fc775c3c246a1586047d6c2e0166977 (patch) | |
| tree | b55fcb88318d13f3fec7a2d57c611f87bc7ae237 /testing/toxic/prompt.c | |
| parent | 611c0af3d69657d75757f60e557e7ad9838a15b5 (diff) | |
| parent | 663764e046fa7f83d03138e370ba074fc851909d (diff) | |
Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master
Conflicts:
testing/toxic/prompt.c
Diffstat (limited to 'testing/toxic/prompt.c')
| -rw-r--r-- | testing/toxic/prompt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c index a53c163f..20f6b480 100644 --- a/testing/toxic/prompt.c +++ b/testing/toxic/prompt.c | |||
| @@ -267,7 +267,6 @@ static void execute(ToxWindow* self, char* u_cmd) { | |||
| 267 | wprintw(self->window, "Message successfully sent.\n"); | 267 | wprintw(self->window, "Message successfully sent.\n"); |
| 268 | } | 268 | } |
| 269 | } | 269 | } |
| 270 | |||
| 271 | else { | 270 | else { |
| 272 | wprintw(self->window, "Invalid command.\n"); | 271 | wprintw(self->window, "Invalid command.\n"); |
| 273 | } | 272 | } |