Merge tag 'upstream/2.1.1' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Mon, 24 Dec 2012 19:58:19 +0000 (21:58 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Mon, 24 Dec 2012 19:58:19 +0000 (21:58 +0200)
commit72e5faa675d7c3a1dc9c1d1fca8de027d3cd2088
tree239af61a14122aebc382e9f7cf7379fb0a119f23
parent794e2a277876f3bea654cbf546d381627ff1a690
parentf82a800771ec0279dd36e257831f876e3b57688a
Merge tag 'upstream/2.1.1' into experimental

Upstream version 2.1.1
CMakeLists.txt