[smuxi: 10/10] Merge remote-tracking branch 'github/master'

From: Mirco M. M. Bauer <mmmbauer src gnome org>
To: commits-list gnome org
Cc:
Subject: [smuxi: 10/10] Merge remote-tracking branch 'github/master'
Date: Fri, 28 Feb 2014 20:54:23 +0000 (UTC)

commit 68f80524d3afa1be2e9e752f4ce96075ba62df06
Merge: 25904d6 f833f3f
Author: Mirco Bauer <meebey meebey net>
Date:   Fri Feb 28 21:53:20 2014 +0100

    Merge remote-tracking branch 'github/master'

 src/Frontend-STFL/Frontend.cs           |   20 +++++++++++++++++++-
 src/Frontend-STFL/Main.cs               |   23 +++++++++++++++++++++++
 src/Frontend-STFL/smuxi-frontend-stfl.1 |    4 ++--
 src/Server/smuxi-server.1               |    9 ++++++++-
 4 files changed, 52 insertions(+), 4 deletions(-)
---

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