From 65ace5dec5c24695501056376e227fb9b1f84a3a Mon Sep 17 00:00:00 2001
From: Zandr Martin <zandrmartin@gmail.com>
Date: Fri, 2 Sep 2016 14:11:48 -0500
Subject: merge in latest commits

---
 sway/commands/bar/binding_mode_indicator.c  | 2 +-
 sway/commands/bar/bindsym.c                 | 4 ++--
 sway/commands/bar/colors.c                  | 2 +-
 sway/commands/bar/font.c                    | 2 +-
 sway/commands/bar/height.c                  | 2 +-
 sway/commands/bar/hidden_state.c            | 6 +++---
 sway/commands/bar/id.c                      | 2 +-
 sway/commands/bar/mode.c                    | 6 +++---
 sway/commands/bar/modifier.c                | 2 +-
 sway/commands/bar/output.c                  | 2 +-
 sway/commands/bar/pango_markup.c            | 2 +-
 sway/commands/bar/position.c                | 2 +-
 sway/commands/bar/separator_symbol.c        | 2 +-
 sway/commands/bar/status_command.c          | 2 +-
 sway/commands/bar/strip_workspace_numbers.c | 2 +-
 sway/commands/bar/swaybar_command.c         | 2 +-
 sway/commands/bar/tray_output.c             | 2 +-
 sway/commands/bar/tray_padding.c            | 2 +-
 sway/commands/bar/workspace_buttons.c       | 2 +-
 sway/commands/bar/wrap_scroll.c             | 2 +-
 20 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'sway/commands/bar')

diff --git a/sway/commands/bar/binding_mode_indicator.c b/sway/commands/bar/binding_mode_indicator.c
index be72cb9b..6f67e15d 100644
--- a/sway/commands/bar/binding_mode_indicator.c
+++ b/sway/commands/bar/binding_mode_indicator.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) {
diff --git a/sway/commands/bar/bindsym.c b/sway/commands/bar/bindsym.c
index 4f50e708..bb81b4a9 100644
--- a/sway/commands/bar/bindsym.c
+++ b/sway/commands/bar/bindsym.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
-#include "config.h"
+#include "sway/commands.h"
+#include "sway/config.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c
index d33a323e..9e374d88 100644
--- a/sway/commands/bar/colors.c
+++ b/sway/commands/bar/colors.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 
 struct cmd_results *bar_cmd_colors(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c
index afc542d2..c586c5bc 100644
--- a/sway/commands/bar/font.c
+++ b/sway/commands/bar/font.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 
diff --git a/sway/commands/bar/height.c b/sway/commands/bar/height.c
index 9ea0a81a..eb576ab3 100644
--- a/sway/commands/bar/height.c
+++ b/sway/commands/bar/height.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_height(int argc, char **argv) {
diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c
index 22035c98..e52a123f 100644
--- a/sway/commands/bar/hidden_state.c
+++ b/sway/commands/bar/hidden_state.c
@@ -1,7 +1,7 @@
 #include <string.h>
-#include "commands.h"
-#include "config.h"
-#include "ipc-server.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/ipc-server.h"
 #include "log.h"
 
 static struct cmd_results *bar_set_hidden_state(struct bar_config *bar, const char *hidden_state) {
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c
index 6ca9f6b6..d62a0961 100644
--- a/sway/commands/bar/id.c
+++ b/sway/commands/bar/id.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_id(int argc, char **argv) {
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
index 321d5a29..3fd6587f 100644
--- a/sway/commands/bar/mode.c
+++ b/sway/commands/bar/mode.c
@@ -1,7 +1,7 @@
 #include <string.h>
-#include "commands.h"
-#include "config.h"
-#include "ipc-server.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/ipc-server.h"
 #include "log.h"
 
 static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode) {
diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c
index 7d4501c7..153d87e6 100644
--- a/sway/commands/bar/modifier.c
+++ b/sway/commands/bar/modifier.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 #include "util.h"
diff --git a/sway/commands/bar/output.c b/sway/commands/bar/output.c
index 9a0d7a73..01a23d9c 100644
--- a/sway/commands/bar/output.c
+++ b/sway/commands/bar/output.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "list.h"
 #include "log.h"
 
diff --git a/sway/commands/bar/pango_markup.c b/sway/commands/bar/pango_markup.c
index fcc38d13..69213c7b 100644
--- a/sway/commands/bar/pango_markup.c
+++ b/sway/commands/bar/pango_markup.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) {
diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c
index 6f97062f..4d0171ba 100644
--- a/sway/commands/bar/position.c
+++ b/sway/commands/bar/position.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_position(int argc, char **argv) {
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c
index 16c455e7..2249da52 100644
--- a/sway/commands/bar/separator_symbol.c
+++ b/sway/commands/bar/separator_symbol.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_separator_symbol(int argc, char **argv) {
diff --git a/sway/commands/bar/status_command.c b/sway/commands/bar/status_command.c
index ec91e9f7..b227ac47 100644
--- a/sway/commands/bar/status_command.c
+++ b/sway/commands/bar/status_command.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 
diff --git a/sway/commands/bar/strip_workspace_numbers.c b/sway/commands/bar/strip_workspace_numbers.c
index 7a709e4b..7cd19d60 100644
--- a/sway/commands/bar/strip_workspace_numbers.c
+++ b/sway/commands/bar/strip_workspace_numbers.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) {
diff --git a/sway/commands/bar/swaybar_command.c b/sway/commands/bar/swaybar_command.c
index 1f28184a..452e2df5 100644
--- a/sway/commands/bar/swaybar_command.c
+++ b/sway/commands/bar/swaybar_command.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"
 
diff --git a/sway/commands/bar/tray_output.c b/sway/commands/bar/tray_output.c
index 39b571d0..8a1b5d35 100644
--- a/sway/commands/bar/tray_output.c
+++ b/sway/commands/bar/tray_output.c
@@ -1,4 +1,4 @@
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_tray_output(int argc, char **argv) {
diff --git a/sway/commands/bar/tray_padding.c b/sway/commands/bar/tray_padding.c
index 978ce0b7..32f8eeba 100644
--- a/sway/commands/bar/tray_padding.c
+++ b/sway/commands/bar/tray_padding.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_tray_padding(int argc, char **argv) {
diff --git a/sway/commands/bar/workspace_buttons.c b/sway/commands/bar/workspace_buttons.c
index ce37fde9..a0e0549d 100644
--- a/sway/commands/bar/workspace_buttons.c
+++ b/sway/commands/bar/workspace_buttons.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) {
diff --git a/sway/commands/bar/wrap_scroll.c b/sway/commands/bar/wrap_scroll.c
index 0a5fbf93..caa85660 100644
--- a/sway/commands/bar/wrap_scroll.c
+++ b/sway/commands/bar/wrap_scroll.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include "commands.h"
+#include "sway/commands.h"
 #include "log.h"
 
 struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) {
-- 
cgit v1.2.3