[seamonkey: 7/7] Merge remote branch 'origin/f14/master'

drago01 drago01 at fedoraproject.org
Tue Jan 4 21:44:51 UTC 2011


commit 4bcbd5f5a8c850486c050f407e9ddc74e59b2b1c
Merge: bfb44a4 af88636
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date:   Tue Jan 4 22:44:01 2011 +0100

    Merge remote branch 'origin/f14/master'
    
    Conflicts:
    	seamonkey.spec

 .gitignore          |    2 ++
 seamonkey-mozconfig |    3 ++-
 seamonkey.spec      |    5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)
---


More information about the scm-commits mailing list