Merge branch 'master' into tizen_2.1
authorJeon Hee Chul <heechul.jeon@samsung.com>
Tue, 19 Mar 2013 11:28:21 +0000 (20:28 +0900)
committerJeon Hee Chul <heechul.jeon@samsung.com>
Tue, 19 Mar 2013 11:28:51 +0000 (20:28 +0900)
Conflicts:
packaging/libmm-player.spec
src/include/mm_player_priv.h
src/mm_player_priv.c

Change-Id: I64bdf91d8cbb3996d8d39197dad7c56ab9b68991

1  2 
src/mm_player_priv.c