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

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

No files matched your search

+1 -1
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: