[smuxi/experiments/tag_messages: 16/41] Merge branch 'stable'
- From: Mirco M. M. Bauer <mmmbauer src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [smuxi/experiments/tag_messages: 16/41] Merge branch 'stable'
- Date: Sun, 3 Apr 2016 10:57:45 +0000 (UTC)
commit 107a3e56c59ee5d7dab8414080c3e24e83e617d3
Merge: 389c5cb 5b8c65c
Author: Mirco Bauer <meebey meebey net>
Date: Mon Jan 18 19:33:39 2016 +0100
Merge branch 'stable'
.travis.yml | 7 +++-
configure.ac | 46 ++++++++++++++-----
lib/JabbR | 2 +-
lib/Newtonsoft.Json | 2 +-
lib/ServiceStack | 2 +-
lib/ServiceStack.Text | 2 +-
lib/SignalR | 2 +-
lib/SmartIrc4net | 2 +-
lib/StarkSoftProxy | 2 +-
lib/Twitterizer | 2 +-
lib/agsxmpp | 2 +-
lib/db4o-net | 2 +-
m4/mono.m4 | 47 +++++++++----------
src/Common-Tests/Common-Tests.csproj | 1 +
src/Common/Common.csproj | 1 +
src/Engine-Campfire/Engine-Campfire.csproj | 1 +
src/Engine-IRC/Engine-IRC.csproj | 1 +
src/Engine-JabbR/Engine-JabbR.csproj | 1 +
.../Engine-MessageBuffer.csproj | 1 +
src/Engine-Tests/Engine-Tests.csproj | 1 +
src/Engine-Twitter/Engine-Twitter.csproj | 1 +
src/Engine-XMPP/Engine-XMPP.csproj | 1 +
src/Engine/Engine.csproj | 1 +
src/Frontend-Curses/Frontend-Curses.csproj | 1 +
src/Frontend-GNOME-IRC/Frontend-GNOME-IRC.csproj | 1 +
.../Frontend-GNOME-Tests.csproj | 1 +
.../Frontend-GNOME-Twitter.csproj | 1 +
src/Frontend-GNOME-XMPP/Frontend-GNOME-XMPP.csproj | 1 +
src/Frontend-GNOME/Frontend-GNOME.csproj | 1 +
src/Frontend-STFL-Tests/Frontend-STFL-Tests.csproj | 1 +
src/Frontend-STFL/Frontend-STFL.csproj | 1 +
src/Frontend-SWF/Frontend-SWF.csproj | 1 +
src/Frontend-Test/Frontend-Test.csproj | 1 +
src/Frontend-Tests/Frontend-Tests.csproj | 1 +
src/Frontend/Frontend.csproj | 1 +
src/Server/Server.csproj | 3 +-
36 files changed, 94 insertions(+), 51 deletions(-)
---
diff --cc lib/Twitterizer
index fe157d6,628a731..8a9bed3
--- a/lib/Twitterizer
+++ b/lib/Twitterizer
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit fe157d682f827e93b4e5926316da1382f43d26e6
-Subproject commit 628a731eb76fafc0022eb16e1f5195579994c9b1
++Subproject commit 8a9bed311b8abf890c2e2aa06f04f93f95952013
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]