[galeon/f13/master: 11/12] Merge branch 'f14' into f13

Yanko Kaneti yaneti at fedoraproject.org
Thu Sep 16 21:29:35 UTC 2010


commit c5965ca43fc2e92bd89faf11f1881643bc671428
Merge: a920959 eda660b
Author: Yanko Kaneti <yaneti at declera.com>
Date:   Fri Sep 17 00:18:07 2010 +0300

    Merge branch 'f14' into f13
    
    Conflicts:
    	galeon.spec

 ...g-network-status-icons-for-the-online-off.patch |   27 ++++++++++++++++++++
 0001-Workaround-embed-missing-crash.patch          |   26 +++++++++++++++++++
 0001-Workaround-tab-label-related-crashes.patch    |   27 ++++++++++++++++++++
 galeon-2.0.7-gtkprint.patch                        |    2 +-
 galeon.spec                                        |   13 +++++++++-
 5 files changed, 93 insertions(+), 2 deletions(-)
---


More information about the scm-commits mailing list