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)
commit2521106c0dccff5f1f6e19105ab8e432ab74a378
treea62c115e653861aa6f69932e123b23684001f9ea
parentc921c0057b3bff3ee34d5244e5b65a6f14c140df
parentf3ceac952f5e3378c734642cafb9bd47ff085874
Merge branch 'master' into resize
src/common/fastmem.c
src/curses/ux_init.c