Merge branch 'master' into next

2013-02-19 00:28:05 +01:00
parent 2922603cc4 4fdf62eb2a
commit d5358a749e
3 changed files with 8 additions and 4 deletions
--- a/parser-specs/commands.spec
+++ b/parser-specs/commands.spec
@ -262,7 +262,7 @@ state MOVE_DIRECTION_PX:
      -> call cmd_move_direction($direction, $pixels)

 state MOVE_WORKSPACE:
-  'to'
+  'to '
      -> MOVE_WORKSPACE_TO_OUTPUT
  workspace = 'next_on_output', 'prev_on_output', 'next', 'prev', 'current'
      -> call cmd_move_con_to_workspace($workspace)