[imsettings/f14/master: 4/4] fix merge conflict

Jens Petersen petersen at fedoraproject.org
Thu Aug 12 08:19:05 UTC 2010

Previous message: [imsettings/f14/master] (4 commits) ...fix merge conflict
Next message: [ibus-xkbc] fixes build.
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit 902514acd713e9ee47d9a1eee6fc7d938abf00a9
Merge: e75b66d ac564f7
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Aug 12 18:16:59 2010 +1000

    fix merge conflict

---

Previous message: [imsettings/f14/master] (4 commits) ...fix merge conflict
Next message: [ibus-xkbc] fixes build.
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the scm-commits mailing list