[tasque/viewmodel: 6/78] Merge branch 'master' into mess2

From: Antonius Riha <antoniusri src gnome org>
To: commits-list gnome org
Cc:
Subject: [tasque/viewmodel: 6/78] Merge branch 'master' into mess2
Date: Wed, 29 Aug 2012 18:35:10 +0000 (UTC)

commit d61fcebe0de1447cbf977bcadacc0ab984c50db8
Merge: 19466a6 a22f946
Author: Antonius Riha <antoniusriha gmail com>
Date:   Fri Jul 13 15:59:07 2012 +0200

    Merge branch 'master' into mess2
    
    Conflicts:
    	src/tasque/RemoteControl.cs

 src/tasque/RemoteControl.cs |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---

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