merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:43 +0000 (01:16 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:43 +0000 (01:16 +0900)
commit794518df48fdb39e7ac9eb0c7b81c5112d40259e
tree05ae11e50f17634a0f9e768d2a2ad17b0070799f
parent0994ce0c4aea82afac44b9cff0d593a0502789fb
merge with master
50 files changed:
CMakeLists.txt
inc/FCntAudioMetadata.h
inc/FCntContentInfo.h
inc/FCntContentManager.h [changed mode: 0755->0644]
inc/FCntContentManagerUtil.h
inc/FCntContentSearch.h [changed mode: 0755->0644]
inc/FCntContentTransfer.h [changed mode: 0755->0644]
inc/FCntDownloadManager.h [changed mode: 0755->0644]
inc/FCntDownloadRequest.h
inc/FCntIContentScanListener.h
inc/FCntIContentUpdateEventListener.h [new file with mode: 0644]
inc/FCntTypes.h
inc/FCntVideoMetadata.h
inc/FContent.h
packaging/osp-content.spec
src/FCntAudioContentInfo.cpp
src/FCntAudioMetadata.cpp
src/FCntContentDirectory.cpp
src/FCntContentManager.cpp
src/FCntContentManagerUtil.cpp
src/FCntContentSearch.cpp
src/FCntContentSearchResult.cpp
src/FCntContentTransfer.cpp
src/FCntDownloadRequest.cpp
src/FCntImageContentInfo.cpp
src/FCntImageMetadata.cpp
src/FCntOtherContentInfo.cpp
src/FCntPlayList.cpp
src/FCntVideoContentInfo.cpp
src/FCntVideoMetadata.cpp
src/FCnt_AudioMetadataImpl.cpp
src/FCnt_ContentDirectoryImpl.cpp
src/FCnt_ContentDownloadListener.cpp
src/FCnt_ContentManagerImpl.cpp
src/FCnt_ContentManagerUtilImpl.cpp
src/FCnt_ContentSearchImpl.cpp
src/FCnt_ContentUtility.cpp
src/FCnt_DownloadManagerImpl.cpp
src/FCnt_DownloadRequestImpl.cpp
src/FCnt_ImageMetadataImpl.cpp
src/FCnt_PlayListImpl.cpp
src/FCnt_PlayListManagerImpl.cpp
src/FCnt_VideoMetadataImpl.cpp
src/inc/FCnt_AudioMetadataImpl.h
src/inc/FCnt_ContentManagerImpl.h
src/inc/FCnt_ContentManagerUtilImpl.h
src/inc/FCnt_DownloadManagerImpl.h
src/inc/FCnt_DownloadRequestImpl.h
src/inc/FCnt_PlayListImpl.h
src/inc/FCnt_VideoMetadataImpl.h