Merge pull request #1209 from isidentical/console-shortcuts

author Alexey Kutepov <reximkut@gmail.com>

Sat, 21 Dec 2019 16:34:15 +0000 (23:34 +0700)

committer GitHub <noreply@github.com>

Sat, 21 Dec 2019 16:34:15 +0000 (23:34 +0700)
author Alexey Kutepov <reximkut@gmail.com>
Sat, 21 Dec 2019 16:34:15 +0000 (23:34 +0700)
committer GitHub <noreply@github.com>
Sat, 21 Dec 2019 16:34:15 +0000 (23:34 +0700)
diff --cc README.md
Simple merge
diff --cc src/ui/console.c
Simple merge
author	Alexey Kutepov <reximkut@gmail.com>
	Sat, 21 Dec 2019 16:34:15 +0000 (23:34 +0700)
committer	GitHub <noreply@github.com>
	Sat, 21 Dec 2019 16:34:15 +0000 (23:34 +0700)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/console.c	patch \|	diff1 \|	diff2 \|	blob \| history