From: Michael Stapelberg <stapelberg@users.noreply.github.com>
Date: Sat, 13 Jun 2015 12:39:19 +0000 (+0200)
Subject: Merge pull request #1752 from Airblader/feature-test-cleanups-1
X-Git-Tag: 4.11~92
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4d25d6a5a66a0846150a741285c60c1b9375a321;p=i3%2Fi3

Merge pull request #1752 from Airblader/feature-test-cleanups-1

Silence "masks earlier declaration in same scope" warnings
---

4d25d6a5a66a0846150a741285c60c1b9375a321