Merge branch 'master' of ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox...
authorSung-jae Park <nicesj.park@samsung.com>
Wed, 26 Nov 2014 05:07:02 +0000 (14:07 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Wed, 26 Nov 2014 05:07:02 +0000 (14:07 +0900)
Conflicts:
packaging/libdynamicbox.spec

Change-Id: I8aa2aa7d70da8efe505691b4bd6842dbde084217

1  2 
packaging/libdynamicbox.spec

@@@ -15,7 -15,7 +15,8 @@@ BuildRequires: pkgconfig(dynamicbox_pro
  BuildRequires: pkgconfig(ecore)
  BuildRequires: pkgconfig(evas)
  BuildRequires: pkgconfig(elementary)
+ BuildRequires: pkgconfig(livebox-service)
 +BuildRequires: model-build-features
  
  %if %{with wayland}
  %else