merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:18:45 +0000 (01:18 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:18:45 +0000 (01:18 +0900)
commit9ecac3f0b4595242535d56b82b02150f99f9e5f4
treee810b2eb7bbbd6e7802069007d62e64b2e4ebf93
parent82e96b9b408afc6113272203dd8e00ead338bb5b
merge with master
CMakeLists.txt
src/desc-indicator.c [changed mode: 0644->0755]