merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:11:55 +0000 (01:11 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:11:55 +0000 (01:11 +0900)
commit1728252b8e9e098e2b44e33a7cc71a941ae45a42
tree23de3723e967b83f73e9bfb6aac08815480a1bac
parentb2ce79924a211d908ebc5cef40889e34bbe9418f
merge with master
14 files changed:
include/media_content.h
include/media_content_type.h
include/media_image.h
include/media_info.h
include/media_info_private.h
include/media_playlist.h
packaging/capi-content-media-content.spec
src/media_content.c
src/media_db.c
src/media_filter.c
src/media_image.c
src/media_info.c
src/media_playlist.c
test/media-content_test.c