[mousetrap/gnome3-wip: 197/240] Merge branch 'ocfw_refactor' of github.com:GNOME-MouseTrap/mousetrap into ocfw_refactor

From: Heidi Ellis <heidiellis src gnome org>
To: commits-list gnome org
Cc:
Subject: [mousetrap/gnome3-wip: 197/240] Merge branch 'ocfw_refactor' of github.com:GNOME-MouseTrap/mousetrap into ocfw_refactor
Date: Mon, 8 Sep 2014 15:29:07 +0000 (UTC)

commit 4e220d3b415a734dfc76721f0ea0bfbae5d68403
Merge: cde4c23 0e7196a
Author: Stoney Jackson <dr stoney gmail com>
Date:   Sat Jun 28 13:41:39 2014 -0400

    Merge branch 'ocfw_refactor' of github.com:GNOME-MouseTrap/mousetrap into ocfw_refactor
    
    Conflicts:
        Makefile.am

---

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