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)
commit3e5837e02d5a089e86dfa9f37071d593b71ca8b0
treef3c8c92e0366680f14932619cb866983e2bb8cb9
parent8b5e3aef34c53f1b3491c2cc5113059ac110910f
parente6ff5a0e2ad4df5a4bfa078c82571338fc12d178
Merge branch '2.0_beta' of ssh://tizendev.org:29418/apps/home/settings into 2.0_beta

Conflicts:
setting-display/src/setting-display-brightness.c
src/setting-main.c
src/setting.c