projects / mathgl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c519531 f77239d)
Merge tag 'upstream/2_rc2+svn376' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Thu, 22 Mar 2012 19:44:53 +0000 (21:44 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Thu, 22 Mar 2012 19:44:53 +0000 (21:44 +0200)
Upstream version 2~rc2+svn376

Conflicts:
texinfo/CMakeLists.txt

1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.