Merge branch 'f18'

Conflicts:
	.gitignore
	hwdata.spec
	sources
This commit is contained in:
Michal Minar 2012-12-07 13:46:21 +01:00
commit d7aea890c5
3 changed files with 6 additions and 1 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ hwdata-0.232.tar.bz2
/hwdata-0.238.tar.bz2
/hwdata-0.240.tar.bz2
/hwdata-0.241.tar.bz2
/hwdata-0.242.tar.bz2

View File

@ -1,6 +1,6 @@
Name: hwdata
Summary: Hardware identification and configuration data
Version: 0.241
Version: 0.242
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
@ -33,6 +33,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}/*
%changelog
* Fri Dec 07 2012 Michal Minar <miminar@redhat.com> 0.242-1
- Update data files
* Wed Nov 07 2012 Michal Minar <miminar@redhat.com> 0.241-1
- Update data files

View File

@ -1,2 +1,3 @@
e7fbd88a28a6acea05feb6064bb49f2c hwdata-0.240.tar.bz2
32dd541d778cfe0dd6100f88433bbc90 hwdata-0.241.tar.bz2
cdecc15b8adc8fe7f0549ffc1eb86826 hwdata-0.242.tar.bz2