[gnome-schedule/freebsd: 10/10] Merge branch 'master' into freebsd

From: Gaute Hope <gauteh src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-schedule/freebsd: 10/10] Merge branch 'master' into freebsd
Date: Wed, 12 Oct 2011 13:22:17 +0000 (UTC)

commit c48ae35014c69e4097334022e411b0b3fa3e03fc
Merge: 08fe39d 57ca40f
Author: Gaute Hope <eg gaute vetsj com>
Date:   Wed Oct 12 15:18:10 2011 +0200

    Merge branch 'master' into freebsd
    
    Conflicts:
    	src/at.py

 src/at.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---

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