summaryrefslogtreecommitdiffstats
path: root/include/config.h
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2016-07-29 07:35:43 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2016-07-29 07:35:43 -0400
commit966127222439620233c27ab835062f6cc69e23ea (patch)
tree7e233c68e7063b7c0c7857a73111e95141fb5b44 /include/config.h
parentMerge pull request #802 from acrisci/feature/timestamp-log-messages (diff)
parentUpdate IPC JSON responses for HiDPI setups (diff)
downloadsway-966127222439620233c27ab835062f6cc69e23ea.tar.gz
sway-966127222439620233c27ab835062f6cc69e23ea.tar.zst
sway-966127222439620233c27ab835062f6cc69e23ea.zip
Merge remote-tracking branch 'origin/hidpi'0.9-rc2
Diffstat (limited to 'include/config.h')
-rw-r--r--include/config.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h
index 87e23187..5e1c123e 100644
--- a/include/config.h
+++ b/include/config.h
@@ -81,6 +81,7 @@ struct output_config {
81 int enabled; 81 int enabled;
82 int width, height; 82 int width, height;
83 int x, y; 83 int x, y;
84 int scale;
84 char *background; 85 char *background;
85 char *background_option; 86 char *background_option;
86}; 87};