projects
/
mathgl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dd16a7f
7dcdf2e
)
Merge tag 'upstream/2.3'
author
Dimitrios Eftaxiopoulos
<eftaxi12@otenet.gr>
Sun, 10 Aug 2014 20:23:26 +0000
(23:23 +0300)
committer
Dimitrios Eftaxiopoulos
<eftaxi12@otenet.gr>
Sun, 10 Aug 2014 20:23:26 +0000
(23:23 +0300)
Upstream version 2.3
Conflicts:
CMakeLists.txt
Trivial merge