Merge branch 'master' into readline

This commit is contained in:
James Booth
2015-02-06 22:05:38 +00:00
4 changed files with 3 additions and 5 deletions

View File

@@ -1466,10 +1466,6 @@ cmd_init(void)
autocomplete_add(time_ac, "seconds");
autocomplete_add(time_ac, "off");
time_ac = autocomplete_new();
autocomplete_add(time_ac, "minutes");
autocomplete_add(time_ac, "seconds");
resource_ac = autocomplete_new();
autocomplete_add(resource_ac, "set");
autocomplete_add(resource_ac, "off");