[emacs-mew/f12/master: 11/11] Merge remote branch 'origin/f13/master' into f12/master

Akira TAGOH tagoh at fedoraproject.org
Tue Oct 19 10:17:42 UTC 2010


commit 21689c79ecb8ce12d1cd3f149b2f6a247d70e695
Merge: 45c2228 56b53b2
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Tue Oct 19 19:17:27 2010 +0900

    Merge remote branch 'origin/f13/master' into f12/master
    
    Conflicts:
    	emacs-mew.spec

 emacs-mew.spec |    6 +++++-
 mew-init.el    |    3 +++
 2 files changed, 8 insertions(+), 1 deletions(-)
---


More information about the scm-commits mailing list