projects
/
mathgl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
22549ae
b1bbcbc
)
Merge tag 'upstream/2.0' into experimental
author
Dimitrios Eftaxiopoulos
<eftaxi12@otenet.gr>
Wed, 18 Apr 2012 16:07:37 +0000
(19:07 +0300)
committer
Dimitrios Eftaxiopoulos
<eftaxi12@otenet.gr>
Wed, 18 Apr 2012 16:07:37 +0000
(19:07 +0300)
Upstream version 2.0
Conflicts:
CMakeLists.txt
lang/CMakeLists.txt
Trivial merge