Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/provider... accepted/tizen/ivi/release accepted/tizen/ivi/stable accepted/tizen_ivi accepted/tizen_ivi_panda accepted/tizen_ivi_release tizen_ivi_release accepted/tizen/20131022.083718 accepted/tizen/20131022.162931 accepted/tizen/20131112.015335 accepted/tizen/ivi/20140304.011239 accepted/tizen/ivi/20140308.012554 accepted/tizen/ivi/panda/20140312.111322 accepted/tizen/ivi/release/20140312.122252 accepted/tizen_ivi_stable/20131116.111500 submit/tizen/20131022.040136 submit/tizen/20140304.005912 submit/tizen/20140308.011314 submit/tizen/20140312.070727 submit/tizen_ivi_release/20140312.071158 submit/tizen_ivi_stable/20131116.101031
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 22 Oct 2013 03:54:27 +0000 (12:54 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 22 Oct 2013 03:54:27 +0000 (12:54 +0900)
commita6118b57c5b083cabc4ce7231cc984a1cdde1916
tree6d82dd874b25fe08ddcd129564d3351c21b44022
parent204a68645f7cd63ef7d34b7d184cd6e38aa4405b
parentb1eb30b5f03c00852f478fa67bd5f03470060a24
Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/provider into work

Conflicts:
packaging/libprovider.spec

Change-Id: I8a611474c6a7044d6a63ff09dccebd80146c2623
CMakeLists.txt
packaging/libprovider.spec