Revision d478be8...

Go back to digest for 2nd December 2012

Bug Fixes in KDE Base

David Faure committed changes in [kdelibs/frameworks] /:

Fix build after bad merge, by restoring these files to their frameworks version.

Aseigo told me to use "git checkout --theirs applet.h" in order to
"take the 4.10 version of the changes where there were conflicts",
but it turns out that this was very bad advice: it loses ALL the changes
ever made to the file in the frameworks branch.

File Changes

Modified 3 files
  •   plasma/applet.h
  •   plasma/packagestructure.cpp
  •   plasma/private/packages.cpp
3 files changed in total