diff options
author | emersion <contact@emersion.fr> | 2017-12-06 19:11:46 +0100 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2017-12-06 19:11:46 +0100 |
commit | c25ad5e7c4dc49cdcda23c25558253e77be8894a (patch) | |
tree | f7099bed2222900d975f866b3571b067921818dd /sway/commands.c | |
parent | Init, merge output config params, use wlr_output_layout (diff) | |
parent | Merge pull request #1501 from emersion/command-include (diff) | |
download | sway-c25ad5e7c4dc49cdcda23c25558253e77be8894a.tar.gz sway-c25ad5e7c4dc49cdcda23c25558253e77be8894a.tar.zst sway-c25ad5e7c4dc49cdcda23c25558253e77be8894a.zip |
Merge branch 'wlroots' into output-config
Diffstat (limited to 'sway/commands.c')
-rw-r--r-- | sway/commands.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sway/commands.c b/sway/commands.c index 961cb867..d6cf7a64 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -95,6 +95,7 @@ static struct cmd_handler handlers[] = { | |||
95 | { "exec", cmd_exec }, | 95 | { "exec", cmd_exec }, |
96 | { "exec_always", cmd_exec_always }, | 96 | { "exec_always", cmd_exec_always }, |
97 | { "exit", cmd_exit }, | 97 | { "exit", cmd_exit }, |
98 | { "include", cmd_include }, | ||
98 | { "output", cmd_output }, | 99 | { "output", cmd_output }, |
99 | }; | 100 | }; |
100 | 101 | ||