diff options
| author | Christopher Roy Bratusek <nano@jpberlin.de> | 2014-11-03 21:14:37 +0100 |
|---|---|---|
| committer | Christopher Roy Bratusek <nano@jpberlin.de> | 2014-11-03 21:14:37 +0100 |
| commit | 0d1cd6623f7804828d4b2dbb568449a49f728cc2 (patch) | |
| tree | dd85de54d59ffe29d0f62942c0c9e3cf3d4a9616 /lumina-desktop/lumina-desktop.pro | |
| parent | debian/changelog (diff) | |
| parent | Add a new desktop plugin: desktopview (diff) | |
| download | lumina-0d1cd6623f7804828d4b2dbb568449a49f728cc2.tar.gz lumina-0d1cd6623f7804828d4b2dbb568449a49f728cc2.tar.bz2 lumina-0d1cd6623f7804828d4b2dbb568449a49f728cc2.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lumina-desktop/lumina-desktop.pro')
| -rw-r--r-- | lumina-desktop/lumina-desktop.pro | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro index f2cb7cb2..479a3e3c 100644 --- a/lumina-desktop/lumina-desktop.pro +++ b/lumina-desktop/lumina-desktop.pro @@ -40,10 +40,8 @@ SOURCES += main.cpp \ panel-plugins/desktopswitcher/LDesktopSwitcher.cpp \ panel-plugins/systemdashboard/LSysDashboard.cpp \ panel-plugins/systemdashboard/SysMenuQuick.cpp \ - desktop-plugins/applauncher/AppLauncherPlugin.cpp -# desktop-plugins/desktopview/DesktopViewPlugin.cpp \ -# desktop-plugins/desktopview/DeskItem.cpp - + desktop-plugins/applauncher/AppLauncherPlugin.cpp \ + desktop-plugins/desktopview/DesktopViewPlugin.cpp HEADERS += Globals.h \ @@ -77,9 +75,8 @@ HEADERS += Globals.h \ panel-plugins/systemdashboard/SysMenuQuick.h \ desktop-plugins/SamplePlugin.h \ desktop-plugins/calendar/CalendarPlugin.h \ - desktop-plugins/applauncher/AppLauncherPlugin.h -# desktop-plugins/desktopview/DesktopViewPlugin.h \ -# desktop-plugins/desktopview/DeskItem.h + desktop-plugins/applauncher/AppLauncherPlugin.h \ + desktop-plugins/desktopview/DesktopViewPlugin.h FORMS += SystemWindow.ui \ panel-plugins/userbutton/UserWidget.ui \ |