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

List:       kde-commits
Subject:    [kget/kf5_port] ui: Merge branch 'kf5_port' of git.kde.org:kget into kf5_port
From:       Lukas Appelhans <l.appelhans () gmx ! de>
Date:       2014-10-29 11:41:23
Message-ID: E1XjRcx-0004q4-Nd () scm ! kde ! org
[Download RAW message or body]

Git commit 19316863e4db2785f47514b5e6843b8b34aff20c by Lukas Appelhans.
Committed on 29/10/2014 at 11:15.
Pushed by lappelhans into branch 'kf5_port'.

Merge branch 'kf5_port' of git.kde.org:kget into kf5_port

Conflicts:
	ui/newtransferwidget.ui

M  +1    -1    ui/history/transferhistoryitemdelegate.cpp
M  +1    -1    ui/linkview/kget_linkview.cpp
M  +1    -1    ui/mirror/mirrorsettings.cpp
M  +2    -2    ui/newtransferdialog.cpp
M  +1    -7    ui/newtransferwidget.ui

http://commits.kde.org/kget/19316863e4db2785f47514b5e6843b8b34aff20c


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