From: Mario <zacjardine@y7mail.com>
Date: Mon, 10 Jul 2017 13:39:47 +0000 (+0000)
Subject: Merge branch 'libpng16fix' into 'master'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=617a0bb788314c24bde82fd5b1158543bc16c6a7;p=xonotic%2Fnetradiant.git

Merge branch 'libpng16fix' into 'master'

[q3map2] do not copypaste zlib, fix 96

Closes #96

See merge request !42
---

617a0bb788314c24bde82fd5b1158543bc16c6a7