Merge branch 'master' into win32-x64-working

Conflicts:
	include/config.h
	src/options.c
This commit is contained in:
nhmall
2015-04-12 11:58:14 -04:00
11 changed files with 187 additions and 80 deletions

View File

@@ -418,6 +418,7 @@
<ClCompile Include="..\sys\winnt\ntsound.c" />
<ClCompile Include="..\sys\winnt\nttty.c" />
<ClCompile Include="..\sys\winnt\winnt.c" />
<ClCompile Include="..\sys\share\cppregex.cpp">
<ClCompile Include="..\win\tty\getline.c" />
<ClCompile Include="..\win\tty\topl.c" />
<ClCompile Include="..\win\tty\wintty.c" />