diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-20 15:53:28 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-20 15:53:28 +0900 |
| commit | 7aa3a253a63f196568782c73dffd23051d1953ba (patch) | |
| tree | 7889289d9868ce3ee7d092ebdaa873fdd9af8eff /packaging | |
| parent | 19fff8a81f9f98dd8d73330d658f7d3026be3ca7 (diff) | |
| parent | 09fe53349b710a7bfa173513c28851a84d36b81a (diff) | |
| download | cups-7aa3a253a63f196568782c73dffd23051d1953ba.tar.gz cups-7aa3a253a63f196568782c73dffd23051d1953ba.tar.bz2 cups-7aa3a253a63f196568782c73dffd23051d1953ba.zip | |
Merge branch 'tizen' of ssh://review.tizen.org:29418/platform/upstream/cups into tizen
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Conflicts:
packaging/cups.list.in
packaging/cups.spec.in
Change-Id: I99ef05cc151d46a9d06ea8d5503540266b3f28fa
Diffstat (limited to 'packaging')
0 files changed, 0 insertions, 0 deletions