Merge branch 'master' of git://anongit.kde.org/kdeplasma-addons
author Sebastian Kügler
()
committer Sebastian Kügler
()
commit 3001011f6fcb1bf4dc5fadc296cc42cd8a96376d
tree 5a203c374404c3870fa093d447f8ba29971830a3
parent 80c4739219b06760f25c517b9e4534250b66dda4
parent 788f6ad767649857e661efb60516b7747da236ff
Merge branch 'master' of git://anongit.kde.org/kdeplasma-addons
11 files changed:
CMakeLists.txt
applets/fileWatcher/fileWatcher.cpp
applets/kimpanel/src/kimpanelinputpanel.cpp
applets/microblog/microblog.cpp
applets/microblog/microblog.h
runners/bing/plasma-runner-bing.desktop
runners/duckduckgo/duckduckgo.desktop
runners/katesessions/katesessions.desktop
runners/konquerorsessions/konquerorsessions.desktop
runners/konsolesessions/konsolesessions.desktop
runners/youtube/plasma-runner-youtube.desktop