projects / apps / core / preloaded / music-player.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: df06ceb ce7acdd)
Merge branch 'app_control' into tizen_2.1
authorHyungmin Kim <hm2007.kim@samsung.com>
Wed, 10 Apr 2013 08:12:12 +0000 (17:12 +0900)
committerHyungmin Kim <hm2007.kim@samsung.com>
Wed, 10 Apr 2013 08:12:12 +0000 (17:12 +0900)
commit58b31a16c2fe825585710613b43d05b0772c2b1a
treec12e1e8d8fe63e09874242fecf5c2dd3c496075btree | snapshot
parentdf06ceb366bcf9b5bc0cc2890d11c36ed290cfd5commit | diff
parentce7acdd86c4070dfdc805e36b498cc7126afbcbccommit | diff
Merge branch 'app_control' into tizen_2.1

Conflicts:
CMakeLists.txt
include/mp-common-defs.h
packaging/org.tizen.music-player.spec
src/common/include/mp-app.h
src/common/mp-play.c
src/core/include/mp-setting-ctrl.h
src/include/mp-define.h

Change-Id: Iff0005be09d24480c6603781a838f9ba4fac24f0
CMakeLists.txt diff1 | diff2 | blob | history
include/mp-common-defs.h diff1 | diff2 | blob | history
packaging/org.tizen.music-player.spec diff1 | diff2 | blob | history
Domain: Applications / Uncategorized;