[cups/f15: 3/4] Merged f14 using 'ours' to allow merging upwards through the branches.

Tim Waugh twaugh at fedoraproject.org
Wed Jun 29 09:43:34 UTC 2011

Previous message: [cups/f15] (4 commits) ...Merge branch 'f14' into f15
Next message: [cups/f15: 4/4] Merge branch 'f14' into f15
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit 99d2fe0139711bbafcd87068877d7117d0030d5c
Merge: e6c38fe e663022
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jun 29 10:13:06 2011 +0100

    Merged f14 using 'ours' to allow merging upwards through the branches.

---

Previous message: [cups/f15] (4 commits) ...Merge branch 'f14' into f15
Next message: [cups/f15: 4/4] Merge branch 'f14' into f15
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the scm-commits mailing list