projects
/
mathgl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b805cfd
7d95b7e
)
Merge tag 'upstream/2.1.2' into experimental
author
Dimitrios Eftaxiopoulos
<eftaxi12@otenet.gr>
Tue, 12 Feb 2013 17:55:58 +0000
(19:55 +0200)
committer
Dimitrios Eftaxiopoulos
<eftaxi12@otenet.gr>
Tue, 12 Feb 2013 17:55:58 +0000
(19:55 +0200)
Upstream version 2.1.2
Conflicts:
CMakeLists.txt
Trivial merge