projects / platform / adaptation / emulator / vmodem-daemon-emulator.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2573293 c61486a)
Merge branch 'master' into tizen_2.2
authorSooyoung Ha <yoosah.ha@samsung.com>
Wed, 14 Aug 2013 02:16:31 +0000 (11:16 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Wed, 14 Aug 2013 02:18:11 +0000 (11:18 +0900)
Conflicts:
packaging/vmodemd-emul.spec

Change-Id: Ia7102422a1df8d364733334775a89c9f9ef25e9b
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

Trivial merge
Domain: SDK / Emulator;