merge upstream

This commit is contained in:
Vitaly Takmazov 2011-10-21 10:43:15 +04:00
commit 959846374f
2 changed files with 3 additions and 3 deletions

View file

@ -7,6 +7,8 @@ if (PROTOBUF_FOUND)
ADD_SUBDIRECTORY(libircclient-qt)
endif()
if (NOT WIN32)
ADD_SUBDIRECTORY(frotz)
endif()
endif()

View file

@ -83,9 +83,7 @@ static void getline_(char *s)
{
int c;
char *p;
fflush(stdout);
fflush(stdout);
p = s;
while (p < s + INPUT_BUFFER_SIZE - 1)
if ((*p++ = xgetchar()) == '\n') {