[libguess/f13/master: 4/4] fix initial merge/conflicts

Michael Schwendt mschwendt at fedoraproject.org
Fri Jan 28 19:47:21 UTC 2011


commit 54b4bb1f9338e57ad81f571cd7d646f297f639d8
Merge: 9a1919e 840cb76
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Jan 28 20:46:55 2011 +0100

    fix initial merge/conflicts

 .gitignore    |    1 +
 libguess.spec |   74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sources       |    1 +
 3 files changed, 76 insertions(+), 0 deletions(-)
---


More information about the scm-commits mailing list