Merge branch '2.0'
authorOlivier Goffart <ogoffart@woboq.com>
Tue, 1 Sep 2015 15:57:56 +0000 (17:57 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Tue, 1 Sep 2015 15:57:56 +0000 (17:57 +0200)
commit3ba5e27d02cfdd4850c83d99f670138bc2607f72
tree72d88dcae337cfc0ec183f9a4765972321338402
parent950bc578d0ba7bff520f365137f19b9b7dd7efbe
parent0fa43538417621e02951e00ca2bdfa8ea0be10cb
Merge branch '2.0'
src/gui/CMakeLists.txt