[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktp-text-ui] /: Merge branch 'kde-telepathy-0.6'
From:       Dominik Cermak <d.cermak () arcor ! de>
Date:       2013-04-01 15:15:18
Message-ID: 20130401151518.ACF2CA6058 () git ! kde ! org
[Download RAW message or body]

Git commit 617b40eee8d17d322ec90ae2a900438d19be492d by Dominik Cermak.
Committed on 01/04/2013 at 17:09.
Pushed by cermak into branch 'master'.

Merge branch 'kde-telepathy-0.6'

Conflicts:
	filters/bugzilla/ktptextui_message_filter_bugzilla.desktop.cmake
	filters/formatting/ktptextui_message_filter_formatting.desktop.cmake
	filters/highlight/ktptextui_message_filter_highlight.desktop.cmake
	filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop.c=
make
	filters/texttospeech/ktptextui_message_filter_tts.desktop.cmake
	filters/youtube/ktptextui_message_filter_youtube.desktop.cmake


http://commits.kde.org/telepathy-text-ui/617b40eee8d17d322ec90ae2a900438d19=
be492d
[prev in list] [next in list] [prev in thread] [next in thread]