Merge remote-tracking branch 'dglOpenGL/master'
authorBergmann89 <info@bergmann89.de>
Sun, 7 Dec 2014 13:44:00 +0000 (14:44 +0100)
committerBergmann89 <info@bergmann89.de>
Sun, 7 Dec 2014 13:44:00 +0000 (14:44 +0100)
Conflicts:
readme

1  2 
dglOpenGL.pas

diff --cc dglOpenGL.pas
Simple merge