Daniele Panozzo 64038eebef Merge commit '96d0f0f75c68e5ace90eaa9c3f6f7af63f053578 [formerly 2bae5b6002]' ...

Former-commit-id: 4122054c4e

2014-06-30 16:13:27 +02:00

..

CMakeLists.txt

Merge commit '9f6c5cdbda735487398f11b323082d46d30b1466 [formerly e63f9f14e9]'

2014-06-30 13:00:59 +02:00

main.cpp

Merge commit '96d0f0f75c68e5ace90eaa9c3f6f7af63f053578 [formerly 2bae5b6002]'

2014-06-30 16:13:27 +02:00