From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Sun, 24 Jun 2018 02:08:25 +0000 (-0400)
Subject: Merge pull request #415 from sgbihu/master
X-Git-Tag: json-c-0.14-20200419~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0568932631958ca206f9f9de49542a867f57ad5;p=thirdparty%2Fjson-c.git

Merge pull request #415 from sgbihu/master

Resolve windows name conflict
---

a0568932631958ca206f9f9de49542a867f57ad5