Merge branch 'rules' of https://github.com/mtwebster/Cinnamon into mt…

…webster-rules

Conflicts:
	po/POTFILES.in

po/POTFILES.in

@@ -3,14 +3,9 @@ data/org.cinnamon.gschema.xml.in
 js/gdm/loginDialog.js
 js/gdm/powerMenu.js
 js/misc/util.js
-js/ui/appDisplay.js
 js/ui/appFavorites.js
 js/ui/autorunManager.js
 js/ui/calendar.js
-js/ui/contactDisplay.js
-js/ui/dash.js
-js/ui/dateMenu.js
-js/ui/docDisplay.js
 js/ui/endSessionDialog.js
 js/ui/extensionSystem.js
 js/ui/keyboard.js
@@ -20,20 +15,11 @@ js/ui/networkAgent.js
 js/ui/notificationDaemon.js
 js/ui/overview.js
 js/ui/panel.js
-js/ui/placeDisplay.js
 js/ui/polkitAuthenticationAgent.js
 js/ui/popupMenu.js
 js/ui/runDialog.js
-js/ui/searchDisplay.js
 js/ui/cinnamonEntry.js
 js/ui/cinnamonMountOperation.js
-js/ui/status/accessibility.js
-js/ui/status/bluetooth.js
-js/ui/status/keyboard.js
-js/ui/status/network.js
-js/ui/status/power.js
-js/ui/status/volume.js
-js/ui/userMenu.js
 js/ui/viewSelector.js
 js/ui/windowAttentionHandler.js
 src/gvc/gvc-mixer-control.c