merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:18:44 +0000 (01:18 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:18:44 +0000 (01:18 +0900)
commit1f28dd8b2f5edd212c2233bbec3a9b2ae017bcae
treea5398e65a6b582661d0e9d8f4a338f22ba1447db
parentabc00c2e80896a5d22e01871374e1639fff292e2
merge with master
CMakeLists.txt [changed mode: 0644->0755]