[libcomps/f18: 4/4] Merge branch 'master' into f18
Jindrich Luza
jluza at fedoraproject.org
Wed Aug 14 10:00:57 UTC 2013
commit 0e575059551ae505822d767988e1122c5eda3350
Merge: c8ac328 adde9f5
Author: Jindrich Luza <jluza at redhat.com>
Date: Wed Aug 14 12:00:21 2013 +0200
Merge branch 'master' into f18
Conflicts:
.gitignore
libcomps.spec
sources
.gitignore | 4 ++++
libcomps.spec | 9 +++++++++
sources | 4 ++++
3 files changed, 17 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 251e92e,6668567..4495658
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
/libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz
++<<<<<<< HEAD
++=======
+ /libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz
++>>>>>>> master
diff --cc libcomps.spec
index b687660,aca5a28..fb82d91
--- a/libcomps.spec
+++ b/libcomps.spec
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
+%global commit 257459634117baa067c3dde2a8ea83def6851094
++=======
+ %global commit 4951a3ec8b8e9a210471c4d42be370a310cc78ab
++>>>>>>> master
Name: libcomps
Version: 0.1.2
@@@ -116,8 -116,8 +120,13 @@@ rm -rf $buildroo
%changelog
++<<<<<<< HEAD
+* Thu Aug 08 2013 Jindrich Luza <jluza at redhat.com> 0.1.2.git2574596
+- spec modified
++=======
+ * Wed Aug 14 2013 Jindrich Luza <jluza at redhat.com> 0.1.2.git4951a3e
+ - __test.py print removed
++>>>>>>> master
* Thu Jul 18 2013 Jindrich Luza <jluza at redhat.com> 0.1.2
- automatic changelog system
diff --cc sources
index 8a0b59f,e38295a..2e23bc5
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+8c37e88f0b7880eaca5225454cc7a1e5 libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz
++=======
+ 8952cd6f4670123eb8b12d169f347157 libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz
++>>>>>>> master
More information about the scm-commits
mailing list