projects / platform / core / appfw / widget-viewer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06bc161 308aaf7)
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:08:10 +0000 (14:08 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Wed, 26 Nov 2014 05:08:10 +0000 (14:08 +0900)
Conflicts:
dynamicbox_viewer/TC/_export_env.sh
dynamicbox_viewer/TC/_export_target_env.sh
dynamicbox_viewer/TC/build.sh
dynamicbox_viewer/TC/clean.sh
dynamicbox_viewer/TC/config
dynamicbox_viewer/TC/push.sh
dynamicbox_viewer/TC/results/0001c/journal
dynamicbox_viewer/TC/results/0004c/journal
dynamicbox_viewer/TC/results/0006c/journal
dynamicbox_viewer/TC/results/0008c/journal
dynamicbox_viewer/TC/results/build-tar-result-1388117141.html
dynamicbox_viewer/TC/results/build-tar-result-1388117141.journal
dynamicbox_viewer/TC/results/build-tar-result-1388117277.html
dynamicbox_viewer/TC/results/build-tar-result-1388117277.journal
dynamicbox_viewer/TC/results/build-tar-result-1388117423.html
dynamicbox_viewer/TC/results/build-tar-result-1388117423.journal
dynamicbox_viewer/TC/results/build-tar-result-1388117533.html
dynamicbox_viewer/TC/results/build-tar-result-1388117533.journal
dynamicbox_viewer/TC/results/exec-tar-result-1388117150.html
dynamicbox_viewer/TC/results/exec-tar-result-1388117150.journal
dynamicbox_viewer/TC/run.sh
dynamicbox_viewer/TC/testcase/Makefile
dynamicbox_viewer/TC/testcase/tslist
dynamicbox_viewer/TC/testcase/utc_livebox_viewer
dynamicbox_viewer/TC/testcase/utc_livebox_viewer.c
dynamicbox_viewer/TC/tet_scen
dynamicbox_viewer/TC/tet_tmp_dir/23996aa/testcase/Makefile
dynamicbox_viewer/TC/tet_tmp_dir/23996aa/testcase/tet_lock/23996aa
dynamicbox_viewer/TC/tet_tmp_dir/23996aa/testcase/tslist
dynamicbox_viewer/TC/tet_tmp_dir/23996aa/testcase/utc_livebox_service.c
dynamicbox_viewer/TC/tetbuild.cfg
dynamicbox_viewer/TC/tetclean.cfg
dynamicbox_viewer/TC/tetexec.cfg

Change-Id: I2862f79d158d4941387786695cac4eb01b8f2b7b

1  2 
packaging/libdynamicbox_viewer.spec patch | diff1 | diff2 | blob | history

diff --cc packaging/libdynamicbox_viewer.spec
index d987317,8a7539f..3244b6f
--- 1/packaging/libdynamicbox_viewer.spec
--- 2/packaging/libdynamicbox_viewer.spec
+++ b/packaging/libdynamicbox_viewer.spec
@@@ -16,9 -16,9 +16,10 @@@ BuildRequires: pkgconfig(gio-2.0
  BuildRequires: pkgconfig(com-core)
  BuildRequires: pkgconfig(sqlite3)
  BuildRequires: pkgconfig(db-util)
+ BuildRequires: pkgconfig(livebox-service)
  BuildRequires: pkgconfig(dynamicbox_service)
  BuildRequires: pkgconfig(vconf)
 +BuildRequires: model-build-features
  
  %if %{with wayland}
  %else
Domain: App Framework / Widget;