[pidgin/f16: 8/8] Fix merge conflicts

Stu Tomlinson nosnilmot at fedoraproject.org
Thu Dec 29 13:07:11 UTC 2011

Previous message: [pidgin/f16: 7/8] Merge branch 'master' into f16
Next message: [pidgin/f15] (7 commits) ...Merge branch 'master' into f15
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit d68587ba1789ad7607a4af5a59bb6352a9da6f65
Merge: 995ba2b 579702d
Author: Stu Tomlinson <stu at nosnilmot.com>
Date:   Thu Dec 29 13:06:36 2011 +0000

    Fix merge conflicts

---

Previous message: [pidgin/f16: 7/8] Merge branch 'master' into f16
Next message: [pidgin/f15] (7 commits) ...Merge branch 'master' into f15
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the scm-commits mailing list