Merge branch 'master' into otr

Conflicts:
	configure.ac
This commit is contained in:
James Booth
2014-01-03 17:54:51 +00:00
2 changed files with 115 additions and 78 deletions

View File

@@ -1297,12 +1297,10 @@ _cons_navigation_help(void)
cons_show("");
cons_show("Navigation:");
cons_show("");
cons_show("Alt-1 : This console window.");
cons_show("Alt-2..Alt-0 : Chat windows.");
cons_show("Alt-1 (F1) : This console window.");
cons_show("Alt-2..Alt-0 (F2..F10) : Chat windows.");
cons_show("Alt-LEFT : Previous chat window");
cons_show("Alt-RIGHT : Next chat window");
cons_show("F1 : This console window.");
cons_show("F2..F10 : Chat windows.");
cons_show("UP, DOWN : Navigate input history.");
cons_show("LEFT, RIGHT, HOME, END : Edit current input.");
cons_show("CTRL-LEFT, CTRL-RIGHT : Jump word in input.");