projects / apps / core / preloaded / settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b5e3ae e6ff5a0)
Merge branch '2.0_beta' of ssh://tizendev.org:29418/apps/home/settings into 2.0_beta
authorMyoungJune Park <mj2004.park@samsung.com>
Fri, 14 Sep 2012 10:17:41 +0000 (19:17 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Fri, 14 Sep 2012 10:17:41 +0000 (19:17 +0900)
Conflicts:
setting-display/src/setting-display-brightness.c

1  2 
src/setting-main.c patch | diff1 | diff2 | blob | history
src/setting.c patch | diff1 | diff2 | blob | history

diff --cc src/setting-main.c
Simple merge
diff --cc src/setting.c
Simple merge
Domain: Applications / Uncategorized;