Merge branch 'master' into smgmaster

Conflicts:
	src/switch_console.c
This commit is contained in:
Moises Silva committed 2011-05-22 17:53:14 -04:00
commit 950e936111
296 files changed
+11586 -7566

No files matched your search

+1 -1
View File
@@ -840,9 +840,9 @@ static const char *basic_gets(int *cnt)
}
Sleep(20);
}
#endif
return command_buf;
#endif
}
#endif