rpms/libcomps
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f18

Browse Source 
Conflicts:
	.gitignore
	libcomps.spec
	sources
This commit is contained in:
Jindrich Luza 2013-08-14 12:00:21 +02:00
commit 0e57505955
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1 +1,5 @@
/libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz /libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz
<<<<<<< HEAD
=======
/libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz
>>>>>>> master

9
libcomps.spec
View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
%global commit 257459634117baa067c3dde2a8ea83def6851094 %global commit 257459634117baa067c3dde2a8ea83def6851094
=======
%global commit 4951a3ec8b8e9a210471c4d42be370a310cc78ab
>>>>>>> master
Name: libcomps Name: libcomps
Version: 0.1.2 Version: 0.1.2
@ -116,8 +120,13 @@ rm -rf $buildroot
%changelog %changelog
<<<<<<< HEAD
* Thu Aug 08 2013 Jindrich Luza <jluza@redhat.com> 0.1.2.git2574596 * Thu Aug 08 2013 Jindrich Luza <jluza@redhat.com> 0.1.2.git2574596
- spec modified - spec modified
=======
* Wed Aug 14 2013 Jindrich Luza <jluza@redhat.com> 0.1.2.git4951a3e
- __test.py print removed
>>>>>>> master
* Thu Jul 18 2013 Jindrich Luza <jluza@redhat.com> 0.1.2 * Thu Jul 18 2013 Jindrich Luza <jluza@redhat.com> 0.1.2
- automatic changelog system - automatic changelog system

4
sources
View File

@ -1 +1,5 @@
<<<<<<< HEAD
8c37e88f0b7880eaca5225454cc7a1e5 libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz 8c37e88f0b7880eaca5225454cc7a1e5 libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz
=======
8952cd6f4670123eb8b12d169f347157 libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz
>>>>>>> master