projects / tools / lthor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10614a3 d08c38e)
Merge branch 'master' into tizen_2.1 2.1b_release accepted/tizen_2.1/20130425.021205 submit/tizen_2.1/20130425.000057
authorjaehoon.you <jaehoon.you@samsung.com>
Fri, 5 Apr 2013 08:35:52 +0000 (17:35 +0900)
committerjaehoon.you <jaehoon.you@samsung.com>
Fri, 5 Apr 2013 08:35:52 +0000 (17:35 +0900)
Conflicts:
AUTHORS
CMakeLists.txt
debian/control
lthor.c
packaging/lthor.spec

Change-Id: Ic566170d83b2319cbcfd3db5813bd9f09e9b2534
Signed-off-by: jaehoon.you <jaehoon.you@samsung.com>

Trivial merge
Domain: System / Kernel;