OSDN Git Service

Merge branch 'master' into kpmcore-3.2
authorAdriaan de Groot <groot@kde.org>
Fri, 15 Dec 2017 12:18:05 +0000 (07:18 -0500)
committerAdriaan de Groot <groot@kde.org>
Fri, 15 Dec 2017 12:18:05 +0000 (07:18 -0500)
commitcc15dd9ec7d55207240f2a3441f7c7ae27af183c
tree64a703fa7e964c33c356d24849c59bb61a4516c0
parent12deb67acef8a78b76858db2ae47a49420fa06b1
parent55ed2ba4c078f2ab4700d6efdfc9fdc84ba5a13b
Merge branch 'master' into kpmcore-3.2

 - Pull in Master, merge README, to simplify merging this
   branch into master (soon-ish, once kpmcore 3.3 becomes available
   in builders)
README.md
src/modules/partition/CMakeLists.txt