Merge branch 'f22' into f23

This commit is contained in:
Jiri Popelka 2015-11-27 10:25:36 +01:00
commit f601529c73
3 changed files with 6 additions and 2 deletions

1
.gitignore vendored
View File

@ -47,3 +47,4 @@
/cups-filters-1.0.75.tar.xz
/cups-filters-1.0.76.tar.xz
/cups-filters-1.1.0.tar.xz
/cups-filters-1.2.0.tar.xz

View File

@ -3,7 +3,7 @@
Summary: OpenPrinting CUPS filters and backends
Name: cups-filters
Version: 1.1.0
Version: 1.2.0
Release: 1%{?dist}
# For a breakdown of the licensing, see COPYING file
@ -246,6 +246,9 @@ fi
%{_libdir}/libfontembed.so
%changelog
* Fri Nov 27 2015 Jiri Popelka <jpopelka@redhat.com> - 1.2.0-1
- 1.2.0
* Tue Oct 27 2015 Jiri Popelka <jpopelka@redhat.com> - 1.1.0-1
- 1.1.0 (version numbering change: minor version = feature, revision = bugfix)

View File

@ -1 +1 @@
f34561df0630f4ece332fd391e31914c cups-filters-1.1.0.tar.xz
9c2c8e358a72455ca63f28f91c8b1af0 cups-filters-1.2.0.tar.xz