projects
/
mathgl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c8abaec
e62725c
)
Merge tag 'upstream/2.2.1+svn921'
author
Dimitrios Eftaxiopoulos
<eftaxi12@otenet.gr>
Sun, 23 Feb 2014 16:53:03 +0000
(18:53 +0200)
committer
Dimitrios Eftaxiopoulos
<eftaxi12@otenet.gr>
Sun, 23 Feb 2014 16:53:03 +0000
(18:53 +0200)
Upstream version 2.2.1+svn921
Conflicts:
CMakeLists.txt
Trivial merge