projects
/
mathgl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
44cbf26
7c3aa54
)
Merge tag 'upstream/2.2.1' into experimental
author
Dimitrios Eftaxiopoulos
<eftaxi12@otenet.gr>
Tue, 28 Jan 2014 18:26:49 +0000
(20:26 +0200)
committer
Dimitrios Eftaxiopoulos
<eftaxi12@otenet.gr>
Tue, 28 Jan 2014 18:26:49 +0000
(20:26 +0200)
Upstream version 2.2.1
Conflicts:
CMakeLists.txt
Trivial merge