From: Michael Stapelberg <stapelberg@users.noreply.github.com>
Date: Sun, 10 Jan 2016 19:04:08 +0000 (-0800)
Subject: Merge pull request #2156 from Airblader/feature-2154
X-Git-Tag: 4.12~34
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=4c1ca3e29a336cd6b1613a9c2605bada2cfb85fc

Merge pull request #2156 from Airblader/feature-2154

Rename decoration_border to child_border.
---

4c1ca3e29a336cd6b1613a9c2605bada2cfb85fc