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

List:       kde-commits
Subject:    [parley] src: Merge branch 'Applications/14.12'
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2015-02-05 1:31:51
Message-ID: E1YJBIN-0003rm-JP () scm ! kde ! org
[Download RAW message or body]

Git commit f65e1c74beb8ad513530703ad44de87231601832 by Inge Wallin.
Committed on 05/02/2015 at 01:30.
Pushed by ingwa into branch 'master'.

Merge branch 'Applications/14.12'

Conflicts:
	src/version.h

M  +1    -0    src/CMakeLists.txt
M  +2    -2    src/collection/entryfilter.cpp
M  +1    -2    src/dashboard/collectionwidget.cpp
M  +7    -17   src/dashboard/dashboard.cpp
M  +0    -1    src/parleydocument.cpp
M  +15   -11   src/statistics/lessonstatisticsview.cpp

http://commits.kde.org/parley/f65e1c74beb8ad513530703ad44de87231601832
[prev in list] [next in list] [prev in thread] [next in thread]