Merge branch '2.0_beta' of ssh://tizendev.org:29418/apps/home/settings into 2.0_beta
authorMyoungJune Park <mj2004.park@samsung.com>
Sat, 8 Sep 2012 04:45:04 +0000 (13:45 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Sat, 8 Sep 2012 04:45:04 +0000 (13:45 +0900)
commit12f81dd4e585b8f6c23c589a172b5813d45ed43f
tree2511318447c3bca3229a048cb910166c12fd4487
parenteb3e232f66343533a2f6b2a7fdd19c31cdc55b2c
parentbed8993b69169d871aa38befc8dca5eea2462830
Merge branch '2.0_beta' of ssh://tizendev.org:29418/apps/home/settings into 2.0_beta

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