Merge tag 'upstream/2_rc2+svn363' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Thu, 15 Mar 2012 13:22:44 +0000 (15:22 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Thu, 15 Mar 2012 13:22:44 +0000 (15:22 +0200)
Upstream version 2~rc2+svn363

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge