merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:18:40 +0000 (01:18 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:18:40 +0000 (01:18 +0900)
commit61a8239579dfc5e4ccc09c557281ba98dfb080f3
tree6db5e6511edf71b261e38171a3989b4976481ebe
parent0790a5d3bf8250afe8f34a9e28fd7ffa48b7ad90
merge with master
CMakeLists.txt