Merge remote-tracking branch 'glBitmap@DGL/master' master
authorBergmann89 <info@bergmann89.de>
Sat, 7 Mar 2015 12:32:09 +0000 (13:32 +0100)
committerBergmann89 <info@bergmann89.de>
Sat, 7 Mar 2015 12:32:09 +0000 (13:32 +0100)
commitd7f77c99adf0a2130f193c5551882d91b9a94e82
tree81f19d4d2b7b3732804b172e164570098e1060cb
parentebe5b36684e93f7eef3e6ac3df33296bb56dc7f0
parent821046d4db90afd95fbbd2c0e1335f58fed38c31
Merge remote-tracking branch 'glBitmap@DGL/master'

Conflicts:
uglcBitmap.pas
uglcBitmap.pas