Merge branch 'master' of slp-scm.sec.samsung.net:/tizen1/api/recorder
authorSeungKeun Lee <sngn.lee@samsung.com>
Mon, 20 Feb 2012 00:05:25 +0000 (09:05 +0900)
committerSeungKeun Lee <sngn.lee@samsung.com>
Mon, 20 Feb 2012 00:05:25 +0000 (09:05 +0900)
commit3ac3bec3640912deb9f742acf4bdd0b9c5771966
tree47e9ea234de61dea950333271bc264bacb5f5d2f
parentfa1661886d4f7f0f7b814f4fff2b2ce3e3212628
parent41115e03d7196844f9f55cf9da80c349fc73591f
Merge branch 'master' of slp-scm.sec.samsung.net:/tizen1/api/recorder

Conflicts:
src/recorder.c
src/recorder.c