[xfce4-settings: 3/3] Fix stupid git conflict

Kevin Fenzi kevin at fedoraproject.org
Sat Jan 21 19:39:13 UTC 2012

Previous message: [xfce4-settings: 2/3] Add patch for multi monitor position settings. Fixes bug #773780
Next message: File PHPUnit_SkeletonGenerator-1.0.0.tgz uploaded to lookaside cache by remi
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit 577b59887c51a62129a15531249b9b68cecb1694
Merge: 4815120 01161f6
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sat Jan 21 12:38:40 2012 -0700

    Fix stupid git conflict

---

Previous message: [xfce4-settings: 2/3] Add patch for multi monitor position settings. Fixes bug #773780
Next message: File PHPUnit_SkeletonGenerator-1.0.0.tgz uploaded to lookaside cache by remi
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the scm-commits mailing list