Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/framework/osp/shell into... accepted/tizen/20131031.112346 submit/tizen/20131031.063734
authorjungmin76.park <jungmin76.park@samsung.com>
Thu, 31 Oct 2013 06:33:34 +0000 (15:33 +0900)
committerjungmin76.park <jungmin76.park@samsung.com>
Thu, 31 Oct 2013 06:33:34 +0000 (15:33 +0900)
1  2 
CMakeLists.txt
src/CMakeLists.txt

diff --cc CMakeLists.txt
index 287b433,74f13de..74f13de
mode 100755,100644..100755
index 3f2bc8d,08e0eb1..08e0eb1
mode 100755,100644..100755