From: MyoungJune Park Date: Fri, 14 Sep 2012 10:17:41 +0000 (+0900) Subject: Merge branch '2.0_beta' of ssh://tizendev.org:29418/apps/home/settings into 2.0_beta X-Git-Tag: accepted/tizen_2.1/20130425.022820~31^2~226 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e5837e02d5a089e86dfa9f37071d593b71ca8b0;p=apps%2Fhome%2Fsettings.git 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 --- 3e5837e02d5a089e86dfa9f37071d593b71ca8b0