projects
/
LazOpenGLCore.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f0b025b
37834ff
)
Merge remote-tracking branch 'dglOpenGL/master'
author
Bergmann89
<info@bergmann89.de>
Sun, 7 Dec 2014 13:44:00 +0000
(14:44 +0100)
committer
Bergmann89
<info@bergmann89.de>
Sun, 7 Dec 2014 13:44:00 +0000
(14:44 +0100)
Conflicts:
readme
1
2
dglOpenGL.pas
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dglOpenGL.pas
Simple merge