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

List:       kde-commits
Subject:    [nepomuk-web-extractor] runtime/webextractor: Merge branch 'master'
From:       Artem Serebriyskiy <v.for.vandal () gmail ! com>
Date:       2011-07-16 17:42:39
Message-ID: 20110716174239.3404EA60C4 () git ! kde ! org
[Download RAW message or body]

Git commit 5a41135c7acff94c08286e99c8c768e03552fd66 by Artem Serebriyskiy.
Committed on 16/07/2011 at 19:42.
Pushed by artemserebriyskiy into branch 'master'.

Merge branch 'master' of ssh://git.kde.org/nepomuk-web-extractor

Conflicts:
	runtime/webextractor/console/CMakeLists.txt
	runtime/webextractor/console/launchPage.ui

R  +3    -0    runtime/webextractor/service/webextractor_plugin.desktop
R  +3    -0    runtime/webextractor/kcm/webextractorconfig.desktop
R  +3    -0    runtime/webextractor/libwebexsettings/webextractor_plugin.desktop
R  +6    -0    runtime/webextractor/plugins/tvdb/webexplugin_tvdb.desktop
R  +6    -0    runtime/webextractor/console/webexconsole.desktop

http://commits.kde.org/nepomuk-web-extractor/5a41135c7acff94c08286e99c8c768e03552fd66

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