Merge branch 'Plasma/5.3'
Conflicts:
lib/kactivities-stats/src/lib/stats/resultset.cpp
ivan | May 7 2015, 10:29 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
02766ae03148 | hein | Clean up some debug junk. | May 7 2015 | |||
89e5482c75dd | ivan | Keeping ResultSet open as little as possible and fixing the count limit | May 7 2015 |