From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 16 Aug 2011 23:52:41 +0000 (+0200)
Subject: Merge branch 'use-xcb-atoms'
X-Git-Tag: 4.0.2~42
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=637d2a3d622dead4aa7b71746bcfbc0caed24bc9;p=i3%2Fi3

Merge branch 'use-xcb-atoms'
---

637d2a3d622dead4aa7b71746bcfbc0caed24bc9