Merge branch 'master' into display-images

This commit is contained in:
Ethan 2016-03-24 18:57:31 -04:00
commit df57d1b702
2 changed files with 5 additions and 0 deletions

View file

@ -1,3 +1,7 @@
include_directories(
${WLC_INCLUDE_DIRS}
)
add_library(sway-common
ipc-client.c
list.c

View file

@ -1,5 +1,6 @@
include_directories(
${JSONC_INCLUDE_DIRS}
${WLC_INCLUDE_DIRS}
)
add_executable(swaygrab