From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 22 Aug 2012 14:01:57 +0000 (+0200)
Subject: Merge branch 'floating-resize-height'
X-Git-Tag: 4.3~67^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2ac3b08cf6ce27f2a56fda6f64da8dfc4b28582c;p=i3%2Fi3

Merge branch 'floating-resize-height'
---

2ac3b08cf6ce27f2a56fda6f64da8dfc4b28582c