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)
commitfcf42ed1c7495ab252f01b52a3ca4b7808ab132e
treee8fea66da0444aa8660a6655bab58e1cb59e2d9c
parentf0b025bf1af258939bfd93cffde3f756a66b49f4
parent37834ffc496e27bb23b87b4309508e7819ba3367
Merge remote-tracking branch 'dglOpenGL/master'

Conflicts:
readme
dglOpenGL.pas