Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/framework/osp/shell accepted/tizen/20130912.150013 accepted/tizen/20130912.191759 accepted/tizen/20130912.195858 submit/tizen/20130912.080403 submit/tizen/20130912.090702
authorjungmin76.park <jungmin76.park@samsung.com>
Fri, 30 Aug 2013 07:03:48 +0000 (16:03 +0900)
committerjungmin76.park <jungmin76.park@samsung.com>
Fri, 30 Aug 2013 07:05:02 +0000 (16:05 +0900)
commit62f1b36de352515dbdcb7a4a43b924e7b3bad1b0
treeadf2577baf7185aa82dba62159b4ac6fa59a01c1
parentb1b3ad421dffa840b59141c3fe167d16e606e28f
parent442657a976ca8cf743629da815d22b4eb23a7128
Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/framework/osp/shell

Conflicts:
packaging/osp-shell.spec
src/core/CMakeLists.txt
CMakeLists.txt
packaging/osp-shell.spec
src/CMakeLists.txt
src/core/CMakeLists.txt