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)
commit7b247ded6c624e91ee14a9b5436106fbbe9c81a3
tree0557930d7584b052b6e08f68b1ae51a7f85151db
parent83f0ec35b1021c53aba5cbe8efe0b43339100057
parent0146b52e53cff3f046e1d8b012027a5cde726229
Merge tag 'upstream/2_rc2+svn380' into experimental

Upstream version 2~rc2+svn380
CMakeLists.txt