Merge pull request #3216 from xantares:patch-1
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 2 Oct 2014 13:25:06 +0000 (13:25 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 2 Oct 2014 13:25:06 +0000 (13:25 +0000)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge