[sawfish: 2/2] Merge remote branch 'origin/master'

From: Christopher Bratusek <chrisb src gnome org>
To: commits-list gnome org
Cc:
Subject: [sawfish: 2/2] Merge remote branch 'origin/master'
Date: Sun, 23 May 2010 15:14:00 +0000 (UTC)

commit c561ba0de9545e284cbc80ef7b4721945a4b44ec
Merge: 5acfa38 2979774
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Sun May 23 17:12:35 2010 +0200

    Merge remote branch 'origin/master'
    
    Conflicts:
    	man/news.texi

 ChangeLog                      |    3 +++
 lisp/sawfish/wm/util/prompt.jl |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)
---

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