| commit | 2de0bd2df12f880ce3a73c6482695b59df20fe31 | |
| author | Jan Kundrát <jkt@gentoo.org> | |
| Mon, 15 Feb 2010 22:26:45 +0000 (15 22:26 +0000) | ||
| committer | Jan Kundrát <jkt@gentoo.org> | |
| Mon, 15 Feb 2010 22:26:45 +0000 (15 22:26 +0000) | ||
| tree | aa6a1fca4644476a4ff30dea019848be8e82c68f | treesnapshot (tar.gz zip) |
| parent | 69f5665aef8e39285ecd85658aa93a5cf7926536 | commitdiff |
Merging changes from the "stable branch" to trunk
Steps for this commit were:
svn-kphotoalbum-stable $ svn log --stop-on-copy -q
svn-kphotoalbum-trunk $ svn merge -r 1040082:HEAD \
svn+ssh://svn.kde.org/home/kde/branches/stable/extragear-kde4/graphics/kphotoalbum \
.
...followed by reverting changes which concern various .desktop files as per
pinotree's feedback on #kde-devel
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/extragear/graphics/kphotoalbum@1090735 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Steps for this commit were:
svn-kphotoalbum-stable $ svn log --stop-on-copy -q
svn-kphotoalbum-trunk $ svn merge -r 1040082:HEAD \
svn+ssh://svn.kde.org/home/kde/branches/stable/extragear-kde4/graphics/kphotoalbum \
.
...followed by reverting changes which concern various .desktop files as per
pinotree's feedback on #kde-devel
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/extragear/graphics/kphotoalbum@1090735 283d02a7-25f6-0310-bc7c-ecb5cbfe19da