merge in latest commits

This commit is contained in:
Zandr Martin 2016-09-02 14:11:48 -05:00
parent 79ffea328c
commit 65ace5dec5
No known key found for this signature in database
GPG key ID: AA2BB8EF77F7BBDC
74 changed files with 144 additions and 144 deletions

View file

@ -1,6 +1,6 @@
#include "commands.h"
#include "config.h"
#include "layout.h"
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/layout.h"
struct cmd_results *cmd_reload(int argc, char **argv) {
struct cmd_results *error = NULL;