[geary/wip/remote-retry: 2/3] Merge branch 'master' into wip/remote-retry

From: Jim Nelson <jnelson src gnome org>
To: commits-list gnome org
Cc:
Subject: [geary/wip/remote-retry: 2/3] Merge branch 'master' into wip/remote-retry
Date: Fri, 23 Jan 2015 01:37:32 +0000 (UTC)

commit 4c42b08aff51770ba16b26a266679c626e0d46b3
Merge: 9689866 ed5914e
Author: Jim Nelson <jim yorba org>
Date:   Thu Jan 22 17:27:07 2015 -0800

    Merge branch 'master' into wip/remote-retry
    
    Conflicts:
        src/engine/imap-engine/imap-engine-minimal-folder.vala
        src/engine/imap-engine/replay-ops/imap-engine-replay-disconnect.vala

---

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