Fix merge with upstream master pull

This commit is contained in:
Tiehuis
2015-02-22 17:46:26 +13:00
3 changed files with 16 additions and 4 deletions

View File

@@ -36,7 +36,7 @@ OPTIONS
CONTROLS
--------
*hjkl or *wasd* or *arrow keys*::
*hjkl* or *wasd* or *arrow keys*::
Movement
*q*::
Quit the game.

View File

@@ -2,12 +2,12 @@
.\" Title: \e20\e4\e8nc
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 12/05/2014
.\" Date: 12/13/2014
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
.TH "\E20\E4\E8NC" "1" "12/05/2014" "\ \&" "\ \&"
.TH "\E20\E4\E8NC" "1" "12/13/2014" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------