Merge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial...
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 13 Nov 2012 15:45:14 +0000 (19:45 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 13 Nov 2012 15:47:16 +0000 (19:47 +0400)
1  2  3  4  5 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge