projects / platform / framework / web / wrt-commons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e0571b 1b5d8b1)
[Release] wrt-commons_0.2.153 submit/tizen_2.2/20130927.091100 submit/tizen_2.2/20130927.101721
authorsung-su.kim <sung-su.kim@samsung.com>
Fri, 27 Sep 2013 00:27:37 +0000 (09:27 +0900)
committersung-su.kim <sung-su.kim@samsung.com>
Fri, 27 Sep 2013 00:27:37 +0000 (09:27 +0900)
Merge branch 'master' into tizen_2.2

Conflicts:
modules/test/src/test_runner_multiprocess.cpp
modules/utils/include/dpl/utils/path.h
modules/utils/src/path.cpp
packaging/wrt-commons.spec
tests/utils/path_tests.cpp

Change-Id: If0e534dbd637f5bd9c6e7ca37f3d949052a66aab


Trivial merge
Domain: Web Framework / Uncategorized;