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

Conflicts: README.txt
2016-02-14 07:35:59 -05:00 · 2016-02-14 07:35:59 -05:00 · 7b2df4578f
parent febb05cbad 2e04fef92d
commit 7b2df4578f
2 changed files with 1 additions and 0 deletions
--- a/README.txt
+++ b/README.txt
@ -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.
--- a/data/textures/gate_steel.png
+++ b/data/textures/gate_steel.png