projects / mathgl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4daa190 ad14048)
Merge tag 'upstream/2_rc2+svn387' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 27 Mar 2012 16:23:46 +0000 (19:23 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 27 Mar 2012 16:23:46 +0000 (19:23 +0300)
Upstream version 2~rc2+svn387

Conflicts:
lang/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.