Merge tag 'upstream/2_rc2+svn380' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 24 Mar 2012 16:07:51 +0000 (18:07 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 24 Mar 2012 16:07:51 +0000 (18:07 +0200)
Upstream version 2~rc2+svn380

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge