Merge remote-tracking branch 'glBitmap@DGL/master'
authorBergmann89 <info@bergmann89.de>
Sat, 31 Jan 2015 14:50:57 +0000 (15:50 +0100)
committerBergmann89 <info@bergmann89.de>
Sat, 31 Jan 2015 14:50:57 +0000 (15:50 +0100)
commitdfa7064d827360dd9a3ce0467fadb3f1c32a36c1
treebafab6d8e6f5e61ad8e003a72cfcc2ce8e26b618
parentff16b4dd097930e3eae26f0d9c29613543e4eff0
parent7c46e251a69e449ae9a041a520d969d3892ede48
Merge remote-tracking branch 'glBitmap@DGL/master'

Conflicts:
uglcBitmap.pas
uglcBitmap.pas