Merge branch 'master' of github.com:arcan1s/awesome-widgets

Conflicts:
	sources/awesome-widget-kde4/graphicalitem.cpp
This commit is contained in:
arcan1s
2015-02-07 01:28:14 +03:00
31 changed files with 1990 additions and 567 deletions

View File

@ -188,7 +188,7 @@ QString DesktopPanel::panelLocationToStr(Plasma::Location loc)
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "Location" << loc;
switch(loc) {
switch (loc) {
case Plasma::TopEdge:
return i18n("Top Edge");
case Plasma::BottomEdge: