Merge branch 'master' of git.kde.org:kipi-plugins
author Gilles Caulier
()
committer Gilles Caulier
()
commit 79fa0e604e6fb486827bc6f3eec8713b4fcad335
tree 8f31ebf001d224109cd72e034afbae32f3905173
parent a54b77de4b0cf2e0165ebc69532f0408cba52dab
parent 11b2d9cf78cd506d9db79d58b4662ba10019e826
Merge branch 'master' of git.kde.org:kipi-plugins
imageshackexport/kipiplugin_imageshackexport.desktop
imgurexport/kipiplugin_imgurexport.desktop
tests/helloworld/kipiplugin_helloworld.desktop