projects / framework / api / system-settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6748d2 f697931)
Merge commit 'refs/changes/80/59380/1' of ssh://tizendev.org:29418/framework/api...
authorMyoungJune Park <mj2004.park@samsung.com>
Wed, 10 Apr 2013 08:42:35 +0000 (17:42 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Wed, 10 Apr 2013 08:42:35 +0000 (17:42 +0900)
Conflicts:
TC_gui/main.c


Trivial merge
Domain: App Framework / Uncategorized;