[fedora-jam-kde-theme/f17: 3/3] Fix merge conflict with master

Brendan Jones bsjones at fedoraproject.org
Mon Dec 10 23:09:38 UTC 2012

Previous message: [fedora-jam-kde-theme/f17] (3 commits) ...Fix merge conflict with master
Next message: [pkgdb] libcompizconfig had acl change status
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit cb307bee9240efb7e9d0da31637070156ed1f257
Merge: 44cf5cf cdd6568
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Tue Dec 11 00:09:26 2012 +0100

    Fix merge conflict with master

---

Previous message: [fedora-jam-kde-theme/f17] (3 commits) ...Fix merge conflict with master
Next message: [pkgdb] libcompizconfig had acl change status
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the scm-commits mailing list