Commit 7b2df457 authored by sdzen's avatar sdzen
Browse files

Merge branch 'next' of git@gitlab.com:sdzen/voxelands.git into next

Conflicts:
	README.txt
parents febb05cb 2e04fef9
......@@ -60,6 +60,7 @@ Action controls:
I - Enter inventory.
Q - Examine pointed block.
H - Use item in hand.
=======
T - Talk / commands.
K - Toggle fly mode.
F1 - Hide / show hud.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment