Merge branch 'master' into resize
authorTimo Korvola <tkorvola@iki.fi>
Wed, 24 Jan 2018 22:05:42 +0000 (00:05 +0200)
committerTimo Korvola <tkorvola@iki.fi>
Wed, 24 Jan 2018 22:05:42 +0000 (00:05 +0200)
1  2 
src/common/fastmem.c
src/curses/ux_init.c

Simple merge
Simple merge