From: Bergmann89 <info@bergmann89.de>
Date: Sun, 7 Dec 2014 13:44:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'dglOpenGL/master'
X-Git-Url: https://git.delphigl.com/?a=commitdiff_plain;h=fcf42ed1c7495ab252f01b52a3ca4b7808ab132e;p=LazOpenGLCore.git

Merge remote-tracking branch 'dglOpenGL/master'

Conflicts:
	readme
---

fcf42ed1c7495ab252f01b52a3ca4b7808ab132e