projects / platform / core / multimedia / media-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 30a3d12 447b7cb)
Merge commit 'refs/changes/94/42094/2' of ssh://review.tizen.org:29418/platform/core... 71/42271/2 accepted/tizen/mobile/20150708.015504 accepted/tizen/tv/20150708.015515 accepted/tizen/wearable/20150708.015529 submit/tizen/20150703.063549 submit/tizen/20150706.082426 submit/tizen/20150707.113050
authorMinje Ahn <minje.ahn@samsung.com>
Thu, 25 Jun 2015 06:44:54 +0000 (15:44 +0900)
committerMinje Ahn <minje.ahn@samsung.com>
Fri, 26 Jun 2015 10:20:29 +0000 (19:20 +0900)
commitfd58033c6b49b10fb22c7e94374502df8f3d896c
tree6787dafe6f950bcc334d431b55031cc4f04e1549tree | snapshot
parent30a3d12911317b13eaeb18ef733f3d911b84c657commit | diff
parent447b7cb291fc3e2e9f666079cec3c8d376ee02b6commit | diff
Merge commit 'refs/changes/94/42094/2' of ssh://review.tizen.org:29418/platform/core/multimedia/media-server into tizen

Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
Conflicts:
lib/media-util-db.c

Change-Id: I53824601191edb36d2f4166312d54dd023ead8b6
src/server/media-server-thumb.c diff1 | diff2 | blob | history
Domain: Multimedia / Media Content;