From: Michal Malý <madcatxster@devoid-pointer.net>
Date: Fri, 1 Aug 2014 15:40:48 +0000 (+0200)
Subject: Merge branch 'master' of devoid-pointer.net:libHPCS
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=4c00280539ef08ab4ad507055102d6cf2e210bca;p=libHPCS.git

Merge branch 'master' of devoid-pointer.net:libHPCS

Conflicts:
	libhpcs_p.h
---

4c00280539ef08ab4ad507055102d6cf2e210bca