[mozc/f15: 2/2] fix conflict

Akira TAGOH tagoh at fedoraproject.org
Mon Feb 27 10:43:24 UTC 2012


commit e2375fb453502bc95b4f8c873e8c8c9ed8937783
Merge: 32dc4ba b694052
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Feb 27 19:43:06 2012 +0900

    fix conflict

 mozc-fix-dirs.patch  |   29 +++++++++++++++++++++++++++++
 mozc-serverdir.patch |   12 ------------
 mozc.spec            |    7 +++++--
 3 files changed, 34 insertions(+), 14 deletions(-)
---


More information about the scm-commits mailing list