Merge remote-tracking branch 'origin/ao-curses'
authorDavid Griffith <dave@661.org>
Wed, 22 Feb 2017 02:53:40 +0000 (18:53 -0800)
committerDavid Griffith <dave@661.org>
Wed, 22 Feb 2017 02:53:40 +0000 (18:53 -0800)
commitcaf63b49c4bf9d46632fde40937892b0cae6441e
tree491ecbb81bc69799a35b66ae3136d4c9f6818768
parentc472ec22c189aae93644cf30bd37fd5c495f6ba3
parentcb98ba7b39e2f7174b927e9c0ed2cd2d0201e77a
Merge remote-tracking branch 'origin/ao-curses'

Conflicts:
.gitignore
ChangeLog
Makefile
PORTING
README
doc/dfrotz.6
doc/frotz.6
src/common/fastmem.c
src/common/frotz.h
src/common/main.c
src/common/process.c
src/common/screen.c
src/curses/ux_audio_none.c
src/curses/ux_blorb.c
src/curses/ux_file.c
src/curses/ux_frotz.h
src/curses/ux_init.c
src/curses/ux_screen.c
src/curses/ux_text.c
src/dos/bcinit.c
src/dumb/dumb_init.c
22 files changed:
.gitignore
ChangeLog
Makefile
README
TODO
doc/dfrotz.6
doc/frotz.6
src/common/fastmem.c
src/common/frotz.h
src/common/sound.c
src/curses/ux_audio.c
src/curses/ux_audio_none.c
src/curses/ux_audio_oss.c
src/curses/ux_blorb.c
src/curses/ux_frotz.h
src/curses/ux_init.c
src/curses/ux_input.c
src/curses/ux_pic.c
src/curses/ux_screen.c
src/curses/ux_text.c
src/dumb/dumb_init.c
src/dumb/dumb_input.c