[gnome-initial-setup/shell/4765: 346/362] Merge remote-tracking branch 'origin/eos2'

From: Jasper St. Pierre <jstpierre src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-initial-setup/shell/4765: 346/362] Merge remote-tracking branch 'origin/eos2'
Date: Thu, 19 Mar 2015 01:50:10 +0000 (UTC)

commit 431d423b318dd72cde9dc474aee473495a1db91c
Merge: 84c967b 062231d
Author: Roddy Shuler <roddy endlessm com>
Date:   Mon Feb 23 14:21:02 2015 -0800

    Merge remote-tracking branch 'origin/eos2'
    
    Conflicts:
        gnome-initial-setup/pages/summary/com.endlessm.Tutorial.FBERemote.xml
        gnome-initial-setup/pages/summary/gis-summary-page.c

---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]