Merge branch 'master' into tizen_2.1
authorDoHyun Pyun <dh79.pyun@samsung.com>
Fri, 22 Mar 2013 00:05:34 +0000 (09:05 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Fri, 22 Mar 2013 00:05:34 +0000 (09:05 +0900)
commit0c4298bf08287b1ef902bd35340df055aec9c44b
tree39bf28fcefd2a45783050e9e66fd1a757cf372b1
parent6283fc523ef97b1fc084c58e13d043d1843af018
Merge branch 'master' into tizen_2.1

Change-Id: I3edb1cea8dcf40ebd52ba32b8f84f26d74e3b306
bluetooth-share-ui.manifest
packaging/org.tizen.bluetooth-share-ui.spec
src/bt-share-ui-ipc.c
src/bt-share-ui-main.c
src/bt-share-ui-main.h
src/bt-share-ui-resource.h
src/bt-share-ui-view.c