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/input/accel_profile.c    | 4 ++--
 sway/commands/input/click_method.c     | 4 ++--
 sway/commands/input/drag_lock.c        | 4 ++--
 sway/commands/input/dwt.c              | 4 ++--
 sway/commands/input/events.c           | 4 ++--
 sway/commands/input/middle_emulation.c | 4 ++--
 sway/commands/input/natural_scroll.c   | 4 ++--
 sway/commands/input/pointer_accel.c    | 4 ++--
 sway/commands/input/scroll_method.c    | 4 ++--
 sway/commands/input/tap.c              | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'sway/commands/input')

diff --git a/sway/commands/input/accel_profile.c b/sway/commands/input/accel_profile.c
index bfc3c76d..290129f5 100644
--- a/sway/commands/input/accel_profile.c
+++ b/sway/commands/input/accel_profile.c
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
-#include "input.h"
+#include "sway/commands.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_accel_profile(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c
index 2001acf2..0a7b7d23 100644
--- a/sway/commands/input/click_method.c
+++ b/sway/commands/input/click_method.c
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
-#include "input.h"
+#include "sway/commands.h"
+#include "sway/input.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_click_method(int argc, char **argv) {
diff --git a/sway/commands/input/drag_lock.c b/sway/commands/input/drag_lock.c
index 7bb2e334..0d100dd0 100644
--- a/sway/commands/input/drag_lock.c
+++ b/sway/commands/input/drag_lock.c
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
-#include "input.h"
+#include "sway/commands.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/dwt.c b/sway/commands/input/dwt.c
index 4010126d..82013730 100644
--- a/sway/commands/input/dwt.c
+++ b/sway/commands/input/dwt.c
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
-#include "input.h"
+#include "sway/commands.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_dwt(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
index 9bf9aa95..2f13e30a 100644
--- a/sway/commands/input/events.c
+++ b/sway/commands/input/events.c
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
-#include "input.h"
+#include "sway/commands.h"
+#include "sway/input.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_events(int argc, char **argv) {
diff --git a/sway/commands/input/middle_emulation.c b/sway/commands/input/middle_emulation.c
index e3087f3a..b2e55468 100644
--- a/sway/commands/input/middle_emulation.c
+++ b/sway/commands/input/middle_emulation.c
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
-#include "input.h"
+#include "sway/commands.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/natural_scroll.c b/sway/commands/input/natural_scroll.c
index 393f26a0..ac8cec12 100644
--- a/sway/commands/input/natural_scroll.c
+++ b/sway/commands/input/natural_scroll.c
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
-#include "input.h"
+#include "sway/commands.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/pointer_accel.c b/sway/commands/input/pointer_accel.c
index e22c51c1..94f595d1 100644
--- a/sway/commands/input/pointer_accel.c
+++ b/sway/commands/input/pointer_accel.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
-#include "commands.h"
-#include "input.h"
+#include "sway/commands.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c
index 8e900a26..de032b64 100644
--- a/sway/commands/input/scroll_method.c
+++ b/sway/commands/input/scroll_method.c
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
-#include "input.h"
+#include "sway/commands.h"
+#include "sway/input.h"
 
 struct cmd_results *input_cmd_scroll_method(int argc, char **argv) {
 	struct cmd_results *error = NULL;
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c
index 8180dcea..9b559447 100644
--- a/sway/commands/input/tap.c
+++ b/sway/commands/input/tap.c
@@ -1,6 +1,6 @@
 #include <string.h>
-#include "commands.h"
-#include "input.h"
+#include "sway/commands.h"
+#include "sway/input.h"
 #include "log.h"
 
 struct cmd_results *input_cmd_tap(int argc, char **argv) {
-- 
cgit v1.2.3