Merge lp:~unity-team/unity/trusty-1276177 into lp:unity

[Stephen M. Webb]

DecoratedWindow: make edges independent from borders and properly update them on actions changed

Fix edge decorations for windows with client-side decorations.

This change is cherry-picked from trunk for SRUing to Ubuntu 14.04 LTS.

Unmerged revisions

3806. By Stephen M. Webb on 2014-12-08

DecoratedWindow: make edges independent from borders and properly update
them on actions change (lp: #1276177), (lp: #1299741), (lp: #1301776),
(lp: #1324104), (lp: #1364225), (lp: #1373695)

3805. By Marco Trevisan (Treviño) on 2014-10-29

Preparing for unity 7.2.4

3804. By PS Jenkins bot on 2014-08-26

Releasing 7.2.3+14.04.20140826-0ubuntu1

3803. By Christopher Townsend on 2014-08-26

Release Unity 7.2.3.

3802. By Stephen M. Webb on 2014-08-26

Prepare fixes for upstream micro-release 7.2.3. Fixes: 1283415, 1292391, 1306211, 1312107, 1320051, 1320071, 1324114, 1339629, 1340171, 1340394, 1340477, 1340992, 1340996, 1342208, 1342731, 1347735

3801. By Marco Trevisan (Treviño) on 2014-08-05

* SECURITY UPDATE: more screen locking fixes (LP: #1349128)
  - debian/patches/lp1349128.patch: flush after ungrabbing the keyboard
    in unity-shared/PluginAdapter.cpp, add GrabScreen() function that
    retries to lockscreen/LockScreenController.cpp,
    lockscreen/LockScreenShield.cpp, lockscreen/LockScreenShield.h.

3800. By PS Jenkins bot on 2014-07-14

Releasing 7.2.2+14.04.20140714-0ubuntu1

3799. By Christopher Townsend on 2014-07-14

Release Unity 7.2.2.
Approved by: Stephen M. Webb

3798. By Christopher Townsend on 2014-07-14

Prepare for upstream micro-release 7.2.2 that includes fixes for the following bugs:
Bug #607796: Launcher, Window management - Dragging and holding a selection over an entry in the Launcher should spread out windows belonging to that application
Bug #727902: Launcher icon highlighting should not switch off as soon the cursor moves after the app spread appears.
Bug #741869: Unity/compiz intercepts Super and Alt keypresses from grabbed windows like VMs.
Bug #754580: Cannot move tabs between multiple Firefox or Chromium windows while using Unity unless windows are both unmaximized, unminimized, and visible.
Bug #839728: Launcher - dragging a item on top of a launcher tile that is a valid drop receptacle in the Launcher should cause that launcher tile to glow
Bug #924840: Keyboard shortcuts overlay text too long
Bug #1281058: [UIFe] The system shutdowns when multiple accounts are open
Bug #1283775: Launcher: icon pips are not always updated properly
Bug #1304882: [Regression] Launcher doesn't reappear fully after hiding from DND
Bug #1305586: Lock screen is unusable when some windows have a keyboard/mouse grab
Bug #1307738: Lockscreen caps lock icon drawn under text entry, should be a white icon.
Bug #1308288: Lockscreen warning icon has no tooltip
Bug #1308323: Shutdown/reboot/login/logout dialogs not scaled after toggling UI scale Edit
Bug #1308911: Clipboard contents are accessible within lockscreen
Bug #1309739: Unity launcher icon edge illumination is offset
Bug #1310200: Indicators disappear at the panel (clementine, dropbox, skype etc)
Bug #1313280: Fullscreen window set to "Always on Top" in single-monitor will hide the lockscreen
Bug #1316005: Panel shadow appears over full screen applications w/ locally integrated menus enabled
Bug #1317348: Switcher (Alt-Tab) does not respect monitor-defined scaling factor
Bug #1317356: Shortcut hint does not respect monitor scaling factor
Bug #1317869: Keyboard shortcuts overlay does not show up when workspaces are enabled at 1366x768
Bug #1320438: Unity launcher auto hide fails on screen unlock using "Super+L"
Bug #1321043: [regression] lock screen bypass with touchpad Fixes: 607796, 727902, 741869, 754580, 839728, 924840, 1281058, 1283775, 1304882, 1305586, 1307738, 1308288, 1308323, 1308911, 1309739, 1310200, 1313280, 1316005, 1317348, 1317356, 1317869, 1320438, 1321043
Approved by: Marco Trevisan (Treviño)

3797. By Christopher Townsend on 2014-06-06

Modify debian/changleog to match what's in distro since a branch to fix a bug was not actually included in the Trusty SRU.

=== modified file 'AUTHORS'
--- AUTHORS	2014-06-18 14:37:16 +0000
+++ AUTHORS	2014-12-08 22:41:57 +0000
@@ -47,6 +47,11 @@
  Christopher Townsend <[e-mail]>
  Chris Townsend <[e-mail]>
  Chris Townsend <[e-mail]>
+<<<<<<< TREE
+=======
+ Chris Townsend <[e-mail]>, Andrea Azzarone <[e-mail]>
+ Chris Townsend <[e-mail]>, Stephen M. Webb <[e-mail]>
+>>>>>>> MERGE-SOURCE
  CI bot <[e-mail]>
  Daniel d'Andrada <[e-mail]>
  Daniel van Vugt <[e-mail]>
@@ -108,6 +113,7 @@
  Marco Mariani <[e-mail]>, Thomi Richards <[e-mail]>
  Marco Trevisan
  Marco Trevisan <[e-mail]>
+ Marco Trevisan <[e-mail]>, Marc Deslauriers <[e-mail]>
  Marco Trevisan <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>, 3v1n0 <[e-mail]>
@@ -184,6 +190,7 @@
  smspillaz <[e-mail]>, Sam Spilsbury <[e-mail]>
  Stephen M. Webb <[e-mail]>
  Stephen M. Webb <[e-mail]>, Andrew McCarthy <[e-mail]>
+ Stephen M. Webb <[e-mail]>, Marco Trevisan (Treviño) <[e-mail]>, Andrea Azzarone <[e-mail]>
  Steve Langasek <[e-mail]>
  Sven Baars <[e-mail]>
  Tarmac

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-11 12:30:55 +0000
+++ CMakeLists.txt	2014-12-08 22:41:57 +0000
@@ -9,8 +9,13 @@
 #
 set (PROJECT_NAME "unity")
 set (UNITY_MAJOR 7)
+<<<<<<< TREE
 set (UNITY_MINOR 3)
 set (UNITY_MICRO 1)
+=======
+set (UNITY_MINOR 2)
+set (UNITY_MICRO 4)
+>>>>>>> MERGE-SOURCE
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "6.0")
 set (UNITY_COMPONENTS_VERSION "6")

=== modified file 'ChangeLog'
--- ChangeLog	2014-06-18 14:37:16 +0000
+++ ChangeLog	2014-12-08 22:41:57 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 2014-06-18  Stephen M. Webb  <[e-mail]>
 
 	bump upstream to 7.3.0
@@ -1648,6 +1649,2060 @@
 	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
 	unless they don't provide, for sure, a full decoration.
 
+=======
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.3+14.04.20140826-0ubuntu1
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Release Unity 7.2.3. 
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	marked new upstream release as an UNRELEASED package
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	removed downstream Ubuntu patches because upstream changes are now included
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	merged in security updates from Ubuntu
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Bump version to 7.2.3.
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	Prepare fixes for upstream micro-release 7.2.3. Fixes: 1283415, 1292391, 1306211, 1312107, 1320051, 1320071, 1324114, 1339629, 1340171, 1340394, 1340477, 1340992, 1340996, 1342208, 1342731, 1347735
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	debian/patches: removing security patch, now included in branch
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	debian/changelog: add new revisions
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SwitcherView, PanelService: correctly handle horizontal and vertical scroll events
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	TextInput: use GdkKeymap to check the caps-lock status
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PlacesOverlayVScrollBar: redirect the mouse wheel scroll events coming from the thumb to the scrollview
+	
+	This will make the scrollview to handle then and perform the same scrolling action it would do otherwise.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: Add GrabScreen function and retry to make sure we really get grab
+	
+	It might happen that the grab is not possible because the PluginAdapter::IsScreenGrabbed
+	request has still not being fully processed, and thus nux is not able to grab the
+	pointer/keyboard. By doing this we instead try to grab the screen, and if this is
+	not happening, we wait a little until we don't get the ungrab event.
+	
+	In this way, if we eventually get the grab, all will work as expected.
+	Otherwise, we cancel the lock request (very unlikely to happen).
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PlacesOverlayVScrollBar and VScrollBarOverlayWindow: add support for scaling
+	
+	Add a new ScrollView class to create ScrollViews with an OverlayScrollbar and with scaling support.
+	Using them in dash Scopes and Previews.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:1340477.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Hud: scale to match current DPI settings for monitor
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entries for lp:1283415 and lp:1340394.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	OverlayRendering: correctly scale the overlays borders and edges to match settings
+	
+	DashStyle has been modified to return smart pointers of textures that are loaded
+	depending on the scale level. The cache will make sure that we don't duplicate
+	the textures and that they get removed when not needed anymore.
+	
+	Also thanks to this the SearchBarSpinner textures (and the other spinners as well)
+	uses the SVGs scaled at the proper size (I desgined a new SVG for the magnifier,
+	as we only had a PNG).
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:1340171.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	FilterWidgets: add support for scaling.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entries for lp:1339629.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Previews: scale the dash preview contents to match current monitor scaling
+	
+	Improved also the scaling of search-bar, spinner, categories and many other components.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entries for lp:1324114.
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	Reduce the scope of the kill command when restarting Compiz.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Add changelog entries for lp:1306211, lp:1320051, and lp:1320071.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenAcceleratorController: do ther configured action on power special keys press
+	
+	We finally can suspend, shutdown, hibernate or start the screensaver when the screen is locked, using
+	the Suspend, Sleep, Hibernate and PowerOff hardware keys.
+	
+	Also the Shutdown dialog doesn't allow now to lock the session if it is not allowed by settings.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Add changelog entry for lp:1292391.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Manually emit nux::Area::geometry_changed beucase nux can fail to emit it.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Add changelog entry for lp:1312107.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove cross fade effect during lock/unlocking. A simple fading works just fine.
+
[phone]  Marco Trevisan  <[e-mail]>
+
+	* SECURITY UPDATE: more screen locking fixes (LP: #1349128)
+	- debian/patches/lp1349128.patch: flush after ungrabbing the keyboard
+	in unity-shared/PluginAdapter.cpp, add GrabScreen() function that
+	retries to lockscreen/LockScreenController.cpp,
+	lockscreen/LockScreenShield.cpp, lockscreen/LockScreenShield.h.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.2+14.04.20140714-0ubuntu1
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Release Unity 7.2.2. 
+	Approved by: Stephen M. Webb
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Bump upstream release to 7.2.2.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Prepare for upstream micro-release 7.2.2 that includes fixes for the following bugs:
+	Bug #607796: Launcher, Window management - Dragging and holding a selection over an entry in the Launcher should spread out windows belonging to that application
+	Bug #727902: Launcher icon highlighting should not switch off as soon the cursor moves after the app spread appears.
+	Bug #741869: Unity/compiz intercepts Super and Alt keypresses from grabbed windows like VMs.
+	Bug #754580: Cannot move tabs between multiple Firefox or Chromium windows while using Unity unless windows are both unmaximized, unminimized, and visible.
+	Bug #839728: Launcher - dragging a item on top of a launcher tile that is a valid drop receptacle in the Launcher should cause that launcher tile to glow
+	Bug #924840: Keyboard shortcuts overlay text too long
+	Bug #1281058: [UIFe] The system shutdowns when multiple accounts are open
+	Bug #1283775: Launcher: icon pips are not always updated properly
+	Bug #1304882: [Regression] Launcher doesn't reappear fully after hiding from DND
+	Bug #1305586: Lock screen is unusable when some windows have a keyboard/mouse grab
+	Bug #1307738: Lockscreen caps lock icon drawn under text entry, should be a white icon.
+	Bug #1308288: Lockscreen warning icon has no tooltip
+	Bug #1308323: Shutdown/reboot/login/logout dialogs not scaled after toggling UI scale Edit
+	Bug #1308911: Clipboard contents are accessible within lockscreen
+	Bug #1309739: Unity launcher icon edge illumination is offset
+	Bug #1310200: Indicators disappear at the panel (clementine, dropbox, skype etc)
+	Bug #1313280: Fullscreen window set to "Always on Top" in single-monitor will hide the lockscreen
+	Bug #1316005: Panel shadow appears over full screen applications w/ locally integrated menus enabled
+	Bug #1317348: Switcher (Alt-Tab) does not respect monitor-defined scaling factor
+	Bug #1317356: Shortcut hint does not respect monitor scaling factor
+	Bug #1317869: Keyboard shortcuts overlay does not show up when workspaces are enabled at 1366x768
+	Bug #1320438: Unity launcher auto hide fails on screen unlock using "Super+L"
+	Bug #1321043: [regression] lock screen bypass with touchpad Fixes: 607796, 727902, 741869, 754580, 839728, 924840, 1281058, 1283775, 1304882, 1305586, 1307738, 1308288, 1308323, 1308911, 1309739, 1310200, 1313280, 1316005, 1317348, 1317356, 1317869, 1320438, 1321043
+	Approved by: Marco Trevisan (Treviño)
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Add changelog entry for lp:1281058.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add a warning in the session dialog if other sessions are still open.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add a warning in the session dialog if other sessions are still open.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: pass the state to compiz plugins activations
+	
+	Fixes Scale triggering on DnD
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: pass the state to compiz plugins activations
+	
+	Fixes Scale triggering on DnD
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.10.20140606.1-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SwitcherView: use RawPixel's for the size values and convert them to match current scaling Fixes: 1317348
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where scaling the edge illumination up and down with the size of the Launcher icons would cause the illumination border to be offset and smaller than the icon. Fixes: 1309739
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Lockscreen warning icon needs a tooltip to say what the warning is about! Fixes: 1308288
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	ShutdownView: Scale up the Buttons and Text plus Borders of the UnityWindowView. Fixes: 1308323
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	TextInput: move the warning icon inside the input field, render it white Fixes: 1307738
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Merge trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ApplicationLauncherIcon: Focus and, in case, Spread the windows on DnD
+	
+	After 1 second that an user is over an icon, that icon should focus the relative
+	application and Spread its windows if it has more than one opened.
+	
+	Correctly handle the DnD scale in launcher, and apply glow to the icon under pointer. Fixes: 607796, 727902, 754580, 839728
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Restore the launcher position by reversing the animation and unsetting the DND_PUSHED_OFF quirk. Fixes: 1304882
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:1310200.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix skype indicator blinking.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix skype indicator blinking.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:1316005.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where the Panel shadow would get drawn over drop down windows in full screen windows.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where the Panel shadow would get drawn over drop down windows in full screen windows.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:1283775.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where the number of Launcher icon pips are not always properly updated when a new window of an already running application is opened.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Get rid of break statement since we need to continue the loop.
+	Relax if/else if logic and just assign boolean regardless what the current value is.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Create a new method that replaces SetWindowVisibleOnMonitor() which also keeps the number of visible windows per monitor for a particular app.
+	Also, remove some of the helper functions added in a previous commit.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Use counter for calculating number of app windows in a viewport and also check if the number of app windows has changed outside of the for loop in order to update Launcher pips for all Launchers in multi-monitor scenarios.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where the number of Launcher icon pips are not always properly updated when a new window of an already running application is opened.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:1320438.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Pass the correct options to showLauncherKeyTerminate in UnityScreen::OnLockScreen
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Pass the correct options to showLauncherKeyTerminate in UnityScreen::OnLockScreen.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:1321043.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Disable switcher gestures if screen is locked. Fixed a regression.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove unwated changes.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Disable switcher gestures if screen is locked. Fixed a regression.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Restore clibpoard on unlock. Update tests too.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Clear the clipboard when locking the screen.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Clear the clipboard when locking the screen.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Add changelog entry for lp:1308911.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Clear the clipboard when locking the screen.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Enable clipboard by default.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Disable clibpoard during lockscreen.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:924840.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ShortcutView: use RawPixel's for the size values and convert them to match current scaling
+	
+	Plus dinamically allocate horizontal space, not to cut the text.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~3v1n0/unity/dynamic-shortcut-hint
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ShortcutView: increase max column widths to make sure they will work with big text
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ShortcutView: adjust column maximum width inside PreLayoutManagement instead that when filling the model
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ShortcutView: some cleanup
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ShortcutView: define maximum columns width, way longer than before
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ShortcutView: reduce the line spacing to match old values
+	
+	This migtht be caused by the StaticCairoText usage, and this spacing actually matches design
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ShortcutController: always fill the model before setting it
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ShortcutView: compute maximum columns width based on text size
+	
+	In this way the text won't be truncated. The text size is computed per each column
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~brandontschaefer/unity/shutdown-dialog-hi-dpi
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ShortcutView: use string literal to build RawPixel's
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merge with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ShortcutView: use RawPixel's for the size values and convert them to match current scaling
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:741869.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: try to grab the screen to make sure that the screen is not grabbed
+	
+	FocusIn event with NotifyGrab mode is not always triggered by X when a window
+	takes the grab, then we need to ensure that there's no grab by trying to get one.
+	We only care about keyboard here, since pointer grabs don't affect us in general.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: don't try to lock if there's a keyboard grab around
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: try to grab the screen to make sure that the screen is not grabbed
+	
+	FocusIn event with NotifyGrab mode is not always triggered by X when a window
+	takes the grab, then we need to ensure that there's no grab by trying to get one.
+	We only care about keyboard here, since pointer grabs don't affect us in general.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.10.20140512.4-0ubuntu1
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	disabled precompiled headers on arm64 Ubuntu package builds Fixes: 1317276
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	lockscreen/LockScreenAccelerators.h: added required header for std:vector definition 
+
[phone]  Mathieu Trudel-Lapierre  <[e-mail]>
+
+	Sync with distro upload for 7.2.0+14.04.20140423-0ubuntu2
+	- replace autopilot-desktop Depends in unity-autopilot with autopilot-desktop-legacy. 
+
[phone]  Mathieu Trudel-Lapierre  <[e-mail]>
+
+	Sync with distro
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add a warning in the session dialog if other sessions are still open. Fixes: 1281058
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Update string.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge trunk.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Send the changed event.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use a ROProperty.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add an extra /n.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix string.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove new line.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add a warning in the session dialog if other sessions are still open.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Set the max width, so our static text wraps. So we don't end up rendering text out of the view area. Fixes: 1312749
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DebugDBusInterface: match properties if they are in the AP array form [<type>, <value>] Fixes: 1307748
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: make sure we don't try to call an invalid initiate/terminate callback function Fixes: 1221673
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: don't try to show Dash/Hud if the screen is grabbed
+	
+	Also move the dash opening out from LauncherController, and get rid of UBus
+	as first initialization source, as it can only slow things down here. Fixes: 741869
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: always paint the lockscreen above, just add menu and onboard as exceptions
+	
+	Some code cleanup, factorizing similar code. Fixes: 1313280
+
[phone]  Jinkyu Yi  <[e-mail]>
+
+	Dash: Fix problem at checking blacklisted unicode range Fixes: 1251193
+
[phone]  William Hua  <[e-mail]>
+
+	Add proper support for modifier-only shortcuts on the lock screen. Fixes: 1291461
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog for lp:1317348.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SwitcherView: use RawPixel's for the size values and convert them to match current scaling
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestSwitcherView: remove obsolete property check
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SwitcherView: use RawPixel's for the size values and convert them to match current scaling
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:1309739.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where scaling the edge illumination up and down with the size of the Launcher icons would cause the illumination border to be offset and smaller than the icon.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Revert the last change and instead, use the icon glow .png file instead of the .svg since Gdk does not seem to be able to handle properly scaling the svg file.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where scaling the edge illumination up and down with the size of the Launcher icons would cause the illumination border to be offset and smaller than the icon.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:1308288.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Lockscreen warning icon needs a tooltip to say what the warning is about!
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Load the warning icon only when we enable show caps lock.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Remove spin_icon_width
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Merge from parent. Fix conflicts.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Merge trunk
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fix multi monitor issue
+	* Fix translation issue
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* No magic strings!
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Add a nice warning tooltip
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:1308323.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	ShutdownView: Scale up the Buttons and Text plus Borders of the UnityWindowView.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Much better way to clean up textures
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Clean up unused textures when a dpi changes, or a monitor changes
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Pre-load textures based on scale value of monitors
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Merge Marcos branch again
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityWindowView: don't keep EMConverter around, we don't need it... Let's use just scale
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Move the CP() call for the const sizes to UnityWindowStyle
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Merge Marcos branch
+	* Merge trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionButton: don't scale the button size twice...
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionButton: remove useless definition
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityWindowView: only expose scale instead of the EMConverter, so we get proper notifications
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ShortcutController: set the monitor property
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityWindowView: don't include UnitySettings in the header...
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SwitcherView: use the UnityWindowView monitor value and scale padding correctly
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	RawPixel: no need to round here, EMConverter will do it
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	EMConverter: just multiply the pixels per DPIScale, it's simpler and safer
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityWindowView: make sure we update the internal offset correctly
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~brandontschaefer/unity/shutdown-dialog-hi-dpi
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Use a map to map textures based on scale size, so we only load scale sizes we need,
+	and still cache them. Good for multi monitor.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Scale the borders
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Scale the closeable window button as well.
+	* TODO Window border, a bit more tricky...
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fix reviews issues.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Undo changes that aren't part of branch
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Merge trunk
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fixes based on review
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* First stage of Shutdown Dialog HiDPI Support
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:1307738.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	TextInput: move the warning icon inside the input field, render it white
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Need the relayout, otherwise the icon is late to show
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Make caps_lock_on private
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Move QueueDraw to the changed callback.
+	* Remove ToggleCapsLock
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Move over detectiong caps lock to TextInput.cpp as well.
+	* Steal Marcos code that puts the Warning icon into a layout (Thanks!)
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Use a fallback icon
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Move the warning icon over the TextInput.
+	* This will make adjusting the IMTextEntry width a bit easier (still a TODO)
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Use the gnome theme to load the warning icon. Looks better, and will scale :)
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* make sure we draw the waring icon above the text entry
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:607796.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ApplicationLauncherIcon: Focus and, in case, Spread the windows on DnD
+	
+	After 1 second that an user is over an icon, that icon should focus the relative
+	application and Spread its windows if it has more than one opened.
+	
+	Correctly handle the DnD scale in launcher, and apply glow to the icon under pointer.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	{Trash,Volume}LauncherIcon: also shimmer on drop-accept
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher: glow launcher icons under the dnd if they accept dropping on them
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	AbstractLauncherIcon: add GLOW quirk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	{Dash,Hud}Controller: use wm signals instead of UBus to hide on VP switch
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: initialize scale_just_activated_ on OnInitiateSpread
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher: don't desaturate the icons when spread is started during DnD
+	
+	Also make sure we redraw when bg_effect_helper status changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: make sure we always set the scale "x_offset" value
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: listen to compiz scale events also for setting scale active/disactive
+	
+	This will allow to get the scale status also when it doesn't take the grab (like in the DnD case)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ApplicationLauncherIcon: Focus and, in case, Spread the application windows after some DnD over the icon
+	
+	After 1 second that an user is over an icon, that icon should focus the relative application and Spread its windows
+	if it has more than one opened
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog entry for lp:1304882.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Restore the launcher position by reversing the animation and unsetting the DND_PUSHED_OFF quirk.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Remove redundant SetHidden()
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Unhide the launcher if it was manually dragged out before DND.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Base change on Trevinhos patch.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	The animation shouldn't get reversed twice as that looks odd.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Unset DND_PUSHED_OFF and reverse the animation to make launcher reappear after DND.
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Added changelog for #1313280.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: always paint the lockscreen above, just add menu and onboard as exceptions
+	
+	Some code cleanup, factorizing similar code.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityWindow: add just one function that computes if a window can bypass lockscreen
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: use a better (and cheaper) way to recognize Onboard window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: always paint the lockscreen above, just add menu and onboard as exceptions
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Modify debian/changleog to match what's in distro since a branch to fix a bug was not actually included in the Trusty SRU.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.1+14.04.20140513-0ubuntu1
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	released upstream micro-release 7.2.1 Fixes: 1221673, 1251193, 1291461, 1307748, 1312749, 1313280, 1317276
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	release Unity 7.2.1
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	debian/changelog: updated with additional lockscreen changes
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1317276
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	disabled precompiled headers on arm64 Ubuntu package builds
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	disabled precompiled headers for arm64 arch, it seems to cause random ICEs
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	lockscreen/LockScreenAccelerators.h: added required header for std:vector definition
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added missing header for std::vector definition
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1312749
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Set the max width, so our static text wraps. So we don't end up rendering text out of the view area.
+
[phone]  Jonas Schwabe
+
+	* Set the max width, so the static text wraps (and doesn't go out of the view!)
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1307748
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DebugDBusInterface: match properties if they are in the AP array form [<type>, <value>]
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DebugDBusInterface: GetPropertyValue should return a proper value only if we've a valid array
+	
+	Improve debugging messages and fix leaks.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DebugDBusInterface: match properties if they are in the AP array form [<type>, <value>]
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1221673
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: make sure we don't try to call an invalid initiate/terminate callback function
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: make sure we don't try to call an invalid initiate/terminate callback function
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1313280
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: always paint the lockscreen above, just add menu and onboard as exceptions
+	
+	Some code cleanup, factorizing similar code.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Mergin with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~3v1n0/unity/lockscreen-keys-disable
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: Get the Hud initialization event if unity is locked
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: if the screen is grabbed when showing the Hud, wait for ungrab for a couple of seconds
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: don't try to show Dash/Hud if the screen is grabbed
+	
+	Also move the dash opening out from LauncherController, and get rid of UBus
+	as first initialization source, that can only slow things down here.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashController: return a bool in ShowDash, wait for ungrab for 2 seconds maximum
+	
+	Now if the screen is grabbed, we just wait a couple of seconds the ungrab-event.
+	If that happens in such timeframe then we show the dash, otherwise we ignore the request.
+	
+	Also return a bool weather we've shown the dash or not.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: notify grab also when the screen is not grabbed but we got a NotifyWhileGrabbed event
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1251193
+
[phone]  Jinkyu Yi  <[e-mail]>
+
+	Dash: Fix problem at checking blacklisted unicode range
+
[phone]  Jinkyu Yi  <[e-mail]>
+
+	Dash: Fix problem at checking blacklisted unicode range. Fixes: 1251193
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1291461
+
[phone]  William Hua  <[e-mail]>
+
+	added proper support for modifier-only shortcuts on the lock screen
+
[phone]  William Hua  <[e-mail]>
+
+	Treat Meta modifier as Alt.
+
[phone]  William Hua  <[e-mail]>
+
+	Minor revisions.
+
[phone]  William Hua  <[e-mail]>
+
+	Destroy accelerator controller between locks.
+
[phone]  William Hua  <[e-mail]>
+
+	Remove gotos.
+
[phone]  William Hua  <[e-mail]>
+
+	Make a separate controller just for accelerators.
+
[phone]  William Hua  <[e-mail]>
+
+	Rip everything out and start anew.
+
[phone]  William Hua  <[e-mail]>
+
+	Add proper support for modifier-only shortcuts on the lock screen.
+
[phone]  Marc Deslauriers  <[e-mail]>
+
+	debian/changelog: sync with distro
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: emit an invalid EntryActivated signal if the menu hasn't actually been shown
+	
+	In addition, if the menu is not visible after the first popup call, try to show a menu
+	without keyboard focus. This will make possible to see menus also when there's a key-grab
+	(although they will be without keyboard support).
+	
+	Finally, reset the menu state, if that failed.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenPanel: if a menu is opened, and the screen is not grabbed, give the grab back to the Shield.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: cleanup the menu popup code, avoid unnecessary calls to gtk_widget_is_visible
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: if the menu is not visible, try to show a menu without keyboard focus
+	
+	This will make possible to see menus also when there's a key-grab.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: emit an invalid EntryActivated signal if the menu has not actually been shown
+	
+	And also reset the menu state, if that failed
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: toggle activation of all the unity compiz actions when locking the screen
+	
+	Also, make sure that the lockscreen views are treated as "always-on-front" windows by nux
+	(and this applies to both visibility and events).
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestSessionController: verify correctly the new Hide method
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: set the primary shield as the always on front window when another basewindow hides
+	
+	That window might have set itself as the always on front window, so we should restore our role
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionController: set the dialog as the nux always on front view
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionController: delete the views when hidden, we don't need to keep them around
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: make sure we reset all the unity views before locking
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: also send the terminate action to Alt pressure on lock
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: toggle all the unity (and thus the Gnome) key bindings when locking
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: don't try to regrab again if we've been just requested to ungrab
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: wait for the next ungrab-event if we can't grab when panel is not active anymore
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: toggle activation of all the unity compiz actions when locking the screen
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: set the blank window or the primary shield as the always-on-front window
+	
+	In this way nux won't draw anything above it, nor will pass events to the underneath windows
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140423-0ubuntu1
+
[phone]  Chris Townsend  <[e-mail]>
+
+	When setting the STARTING quirk for Application Launcher icons, only do it for the monitor specified in the passed in args. Fixes: 1291362
+
[phone]  Chris Townsend  <[e-mail]>
+
+	When setting the STARTING quirk for Application Launcher icons, only do it for the monitor specified in the passed in args.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Close dash/hud/etc. on signal locked too. Fixes: 1308850
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use prompt_lock_requested signal.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Close dash/hud/etc. on signal locked too.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Close dash/hud/etc. on signal locked too.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140416-0ubuntu1
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Do not allow to activate twice the same entry! Fixes: 1308572
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Minor change.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix ident.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Do not allow to activate two times the same entry!
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: save a locked.stamp file when locking/unlocking, to relock on startup
+	
+	This makes unity to relocks if it was locked before crashing... Fixes: 1308572
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: Save lock file stamp in $XDG_RUNTIME_DIR, cleanup it on destroy
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DesktopUtilities: add GetUserRuntimeDirectory to fetch $XDG_RUNTIME_DIR
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: save a locked.stamp file when locking/unlocking, to relock on startup
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DesktopUtilities: add GetCacheDirectory, to fetch and create an unity cache dir
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140414.1-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	
+	CompizUtils: only shadow-decorate alpha windows that have full decorations as well
+	
+	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
+	unless they don't provide, for sure, a full decoration.
+	
+	This fixes, between the others, the unity force-quit dialog. Fixes: 1281825, 1307524
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: only shadow-decorate alpha windows that have full decorations as well
+	
+	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
+	unless they don't provide, for sure, a full decoration.
+	
+	This fixes, between the others, the unity force-quit dialog.
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Scale: Correctly detect the activation of a scale and set scale_just_activated_
+	to true properly. Fixes: 1288789
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Scale: Correctly detect the activation of a scale and set scale_just_activated_
+	to true properly.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Security issue: Gestures on the lock screen allow to peek inside running applications.
+	As with keyboard input, gestures should be blocked while the screen is locked. Fixes: 1303041, 1306973
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Stop hiding the launchers parent window for now as it breaks urgent icon wiggling and hint shadow.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Don't queue up drawing if the gestures are ignored.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Make the lockscreen_controller accessible to other classes and don't allow 4 finger gestures in the lock screen.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Should not even try to show the switcher if the screen is locked.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Forgot a variable
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Also, don't hide the launcher window if expo or scale are active.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Really shouldn't hide the launcher window if the dash is open.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140411-0ubuntu1
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Lockscreen: Give proper grabs to the shield before releasing blank_window_. Fixes: 1306417
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Lockscreen: Give proper grabs to the shield before releasing blank_window_.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140410.1-0ubuntu1
+
[phone]  William Hua  <[e-mail]>
+
+	Enable sound buttons and input source switching under lock screen. 
+
[phone]  William Hua  <[e-mail]>
+
+	Clean up.
+
[phone]  William Hua  <[e-mail]>
+
+	Fix merge errors.
+
[phone]  William Hua  <[e-mail]>
+
+	Minor changes.
+
[phone]  William Hua  <[e-mail]>
+
+	Merge trunk.
+
[phone]  William Hua  <[e-mail]>
+
+	Enable sound and input source shortcuts on lock screen.
+
[phone]  CI bot  <[e-mail]>
+
+	LockScreen: add ability to show without fading in on some system calls
+	
+	Also, if locking is not enabled, calling Lock causes the screensaver to be initiated.
+	Many cleanups and misc fixes. Fixes: 1292575, 1305194
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	It fixes the quicklist menu appearance. Fixes: 1298859
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed quicklist scaling
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	When we detect caps lock, or caps lock is pressed, render a warning icon to show its on. Fixes: 1291737
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Make sure we update the caps lock detector when we change primary sheilds
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Get rid of magic numbers, have to get the width of the cached
+	spin icon width, so we can place the warning icon in the right spot
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Check if caps is on each time we make a new Prompt, as it can change
+	when authenticating, and we need to know.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Detect if caps lock is on, and check if caps lock is pressed.
+	If so, then render a warning icon.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	If the dash has not been opened before, a 4 finger tap will result in a dash with no selected scope.
+	Instead, set up the window and view of the dash by sending DASH_ABOUT_TO_SHOW (same happens when hovering the mouse pointer over the BFB icon)
+	and open the home scope. Fixes: 1303468
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	UnityGestureTarget.cpp: Remove spaces
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	4 finger tap: Set up the dash window and its view, show the home scope afterwards.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Launcher: Show and hide the launcher window OnDragUpdate() to fix the gesture animations Fixes: 1303141
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Only hide/unhide launcher window if autohide mode is on.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Actually, Hide/Un-Hide launcher window in OnDragUpdate.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Un-hide launcher window when dragging out using 4 finger gesture: https://bugs.launchpad.net/unity/+bug/1303141
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Alt-Tab has always respected the alt-tab-bias-viewport setting, but the 3-finger gesture to switch between windows has not, even though it does the same thing.
+	They should behave the same way depending on the CCSM setting. Fixes: 1303060
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Make 3 finger window switch gesture respect the alt-tab-bias-viewport setting by moving the check to SetUpAndShowSwitcher.
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Shortcuts: Listen and react to view close requests. Fixes: 1297842
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Shortcuts: Listen and react to view close requests.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsGrabEdge, PanelMenuView: perform proper WM action on clicks, based on user settings Fixes: 1283849
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: use generic actions based on WM settings for double,middle and right clicks
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager: add methods to {Horizontally,Vertically}Maximize a window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager: add window shading methods
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsGrabEdge: perform proper WM action on clicks, based on user settings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationStyle: add WindowManagerAction to get WM click options
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~3v1n0/unity/right-left-click-maximize-fix
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140410-0ubuntu1
+
[phone]  CI bot  <[e-mail]>
+
+	Session: Don't lock the screen if screen locking is disabled by
+	org.gnome.desktop.lockdown disable-lock-screen. Fixes: 1292154
+
[phone]  CI bot  <[e-mail]>
+
+	ScreenSaverDBusManager: start/stop gnome-screensaver if we don't/do handle the locking
+	
+	This allows to just use the fallback gnome-screensaver lockscreen if we need to use it. Fixes: 1303712
+
[phone]  CI bot  <[e-mail]>
+
+	GnomeSessionManager: impelement gnome session dbus interface and a fader to blank the screen Fixes: 1291088, 1292041, 1292078, 1292446, 1292451
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreen: add ability to show without fading in on some system calls
+	
+	Also, if locking is not enabled, calling Lock causes the screensaver to be initiated.
+	Many cleanups and misc fixes. Fixes: 1292575, 1305194
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: fire screensaver_post_lock_timeout_ when the view is fully visible
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GnomeSessionManager: if it's impossible to lock a session, start the screensaver on lock
+	
+	This is what most of apps expect, and thus we do that. Although it's not really that coherent.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionManager: add ScreenSaver{Activate,Deactivate} and relevant signals and export them
+	
+	Update LockScreenController and dbus apis to match this
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: remove some racy code, avoid to emit multiple signals
+	
+	And fix pre-lock blank window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: increase the lockscreen timeout wait to be bigger to a frame duration
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionDBusManager: export PromptLock method on the dbus
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BackgroundSettings: don't create new panel style instances, use the actual instance
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: get rid of the old active_ bool variable, that caused undefined behavior
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: even more cleanup, move blank window grabbing to own function
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityWindow: we need to paint also the decorations of the windows, when in lock-mode
+	
+	Othewise their texture won't be rebuilt and this will lead to wrong textures.
+	Also, we don't need to damage the screen when lock opacity changes as it's done by nux.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: also hide BlankWindow on mouse and keyboard down events
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: show a blank window unless we don't have the lockscreen ready on prompt requests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionDBusManager: add support for "PromptLock"
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GnomeSessionManager: use prompt lockscreen on logind lock requests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: add support to PromptLockScreen
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionManager: add PromptLockScreen method and signal, to require a fast lock (with no fading)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~sjakthol/unity/fix-1292154
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Don't cache the value and watch for changes. Check the setting every time instead.
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Session: Don't lock the screen if screen locking is disabled by
+	org.gnome.desktop.lockdown disable-lock-screen.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: make sure whe hide the blank window on unlock
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~laney/unity/g-s-replace
+	
+	Remves the ugly killall
+
[phone]  Iain Lane  <[e-mail]>
+
+	Take over as the owner of the gnome-screensaver interface, if necessary.
+
[phone]  Iain Lane  <[e-mail]>
+
+	Allow skipping of the tests with DEB_BUILD_OPTIONS=nocheck
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent branch
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: add ShowBlankWindow method
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityShell: ops, remove wrong change
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent branch
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: start the screensaver after few seconds that the user has locked his session, if there's no more interaction
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: emit a signal when we receive a keyboard input
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: immediately start the screensaver on SetActive dbus call
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: add request_activate signal that is emitted on remote activation request
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: some cleanup, and HideBlankWindow on simulate user activity
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: keep track of dbus_manager and reset screensaver on simulate-user activity
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: implement SimulateUserActivity
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: use a nux property for active state
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: don't animate when locking the screen on suspend or screensaver
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: we can lock the screen if the GS setting is disabled
+	
+	Also rename the setting to be more understandable
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent branch
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: always call LockScreen of SessionManager as it has some checks
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: damage the screen when the lockscreen opacity changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: use a ROProperty for opacity
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: only try to lock if locking is enabled
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: use timeout seconds for lock delay
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: only use one window to blank the screen, it's not needed to have one per monitor
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: move OnPresenceStatusChanged into a function
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: lock the screen on suspend if ubuntu is configured to do so
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Uscreen: emit suspending signal on PrepareForSleep
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: use direction to set the animation value
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ExternalGschema: add missing external settings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenSettings: also use legacy lockscreen if screen reader is enabled
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: add some comments
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: use async calls
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: call gnome-screensaver to lock the screen if we use a legacy lockscreen
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: start/stop gnome-screensaver if we don't/do handle the locking
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenSettings: add use_fallback option, that is on if OSK is active
+	
+	This is to workaround on screen keyboard issues
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Add GS schemas to external list
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GnomeSessionManager: use enum class PresenceStatus instead of magic numbers
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge trunk.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove magic numbers.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Do not implement SimulateUserActivity.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Update tests.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Start cleaning lockscreen code.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix. Code style is still WIP.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Lock the screen after a delay.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add the first settings.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Initial commit to implement g-s dbus interface in unity.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140404-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: add a new "sheet style" dialog that is shown when a window hangs
+	
+	Listen to compiz toolkit events and prompt a dialog that allows to force-quit an
+	hanging application. Fixes: 698031, 1299061, 1299080
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: make sure that the dialog is not deletable by WM
+	
+	For this to be safe we need also to ignore the delete events
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	POTFILES: include DecorationsForceQuitDialog.cpp
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: let's do one line things!
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: make sure we hide the dialog before we killed the parent window
+	
+	It must be hidden before than the parent, in case the window is not really killed,
+	it will be shown anyway later.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: avoid warnings on close, due to finalized close button
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: emit close_request signal on close and "Wait" button
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: add close_request signal and destroy window when it  gets called
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: add missing call to UpdateForceQuitDialogPosition
+	
+	Maybe it was removed due to a shelved change...
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: implement actual window killing by using both XKillClient and kill -9
+	
+	Yeah, now
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: use proper class names (mostly for theming)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: use themed button textures
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: set the dialog pid/hostname to match the ones of the parent window
+	
+	In this way we don't confuse BAMF about the ownership of the dialog.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: use the same window class of the real parent window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: keep the dialog centered on parent window when its geometry changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsManager.cpp: show a forcequit dialog when we get a toolkitActionForceQuitDialog ClientMessage
+	
+	These events are triggered directly by compiz, so we only have to catch them!
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: add ShowForceQuitDialog method to show a forcequit dialog on given window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: set dialog X time to match the one of the close event
+	
+	In this way we correctly handle the focus-stealing prevention
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: set shape area to ignore input events outside the actual dialog
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: set parent window as its actual parent X-side, and center on it
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: fix label strings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merge with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: obey to style for shadows
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: add first basic gtk implementation of the force-quit dialog
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where windows that are in Show Desktop mode are selected for spread have a blank preview. This fix will Fade Out the window for Spread and Fade In the window again when Spread exits if that window is not chosen. Fixes: 1104236
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where windows that are in Show Desktop mode are selected for spread have a blank preview.  This fix will Fade Out the window for Spread and Fade In the window again when Spread exits if that window is not chosen.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140403-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsGrabEdge: Only perform tookit actions on right-click Fixes: 1301459
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsGrabEdge: Only perform tookit actions on right-click
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: reset decoration::DataPool on destruction, otherwise we won't have a valid screen ptr Fixes: 1291243
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: reset decoration::DataPool on destruction, otherwise we won't have screen ptr valid
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsDataPool: add static Reset method that allows to reset our textures
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ApplicationLauncherIcon: recompute pips when the screen geometry changes Fixes: 1024101
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ApplicationLauncherIcon: recompute pips when the screen geometry changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher: hide the launcher window when in auto-hide mode if it's not presented Fixes: 1301394
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher: hide the launcher window when in auto-hide mode if it's not presented
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	remove libsyncindicator from services/panel-service.c 
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	remove libsyncindicator.so (lp: #1300916)
+
[phone]  Dimitri John Ledkov  <[e-mail]>
+
+	Drop U1 default shortcuts & indicator-sync recommendation. (LP: #1300916) Fixes: 1300916
+
[phone]  Dimitri John Ledkov  <[e-mail]>
+
+	Drop U1 default shortcuts & indicator-sync recommendation. (LP: #1300916)
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140402-0ubuntu1
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	bump to release 7.2.0 
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	debian/control: fix some style warnings in package description
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	debian/changelog: fix syntax to silence a lintian warning
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	debian/control(Standards-Version): bump to 3.9.5 (no changes)
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	release 7.2.0
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: use launcher width, scale on HiDPI, match also application names
+	
+	Launcher Width is now considered in setting the offset of the scale filter (fixes
+	padding when launcher is in autohide mode).
+	The search bar is correctly scaled when in HiDPI mode.
+	We use ApplicationManager and thus BAMF to match windows by their name or app name. Fixes: 1281297, 1282001, 1300763, 1300842
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: use casefold instead that tolower as it's meant for equalty checks as we do here
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: implement our own to_lower_copy that works with utf8
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: match the scaled windows based on the SpreadFilter matches
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: compute a list of filtered windows using both window and application name
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: take in consideration the launcher width when setting the spread offset
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter :Scale the internal searchbar to match DPI settings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBar: fix crash when trying to update the show filter scale in a filterless-search bar
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: use panel style context for painting the panel title Fixes: 1296866
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: add "panel-title" class to the panel style context when drawing title
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelStyle: return a Style context with different widget path in GetStyleContext based on type
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: use panel style context for painting the panel title
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationStyle: allow to use a different style context in DrawTitle
+	
+	Panel will need to use a different one
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Panel, Decorations: draw the background under the text glyphs before the text itself Fixes: 723167
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnitySettings: never allow values minor or equal to 0 as UI scale
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsMenuEntry: draw background under text glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsTitle: draw background under text glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationStyle: draw text glyphs background on menu items
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: draw the background under the text glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationStyle: add support for drawing the text background under the glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelIndicatorEntryView: draw the background under the text glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: only shadow-decorate alpha windows that have full decorations as well
+	
+	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
+	unless they don't provide, for sure, a full decoration. Fixes: 1281825
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: only shadow-decorate alpha windows that have full decorations as well
+	
+	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
+	unless they don't provide, for sure, a full decoration.
+
+>>>>>>> MERGE-SOURCE
 2014-03-28  CI bot  <[e-mail]>
 
 	Releasing 7.1.2+14.04.20140328.1-0ubuntu1

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2014-10-21 13:45:43 +0000
+++ UnityCore/GnomeSessionManager.cpp	2014-12-08 22:41:57 +0000
@@ -426,12 +426,22 @@
 {
   EnsureCancelPendingAction();
 
-  if (!manager_->CanLock())
-  {
-    manager_->ScreenSaverActivate();
-    return;
-  }
-
+<<<<<<< TREE
+  if (!manager_->CanLock())
+  {
+    manager_->ScreenSaverActivate();
+    return;
+  }
+
+=======
+  if (!manager_->CanLock())
+  {
+    manager_->ScreenSaverActivate();
+    return;
+  }
+
+  // FIXME (andy) we should ask gnome-session to emit the logind signal
+>>>>>>> MERGE-SOURCE
   prompt ? manager_->prompt_lock_requested.emit() : manager_->lock_requested.emit();
 }
 

=== modified file 'dash/FilterBasicButton.cpp'
--- dash/FilterBasicButton.cpp	2014-08-27 12:56:22 +0000
+++ dash/FilterBasicButton.cpp	2014-12-08 22:41:57 +0000
@@ -69,13 +69,19 @@
     if (GetInputEventSensitivity())
       Active() ? Deactivate() : Activate();
   });
+<<<<<<< TREE
 
   scale.changed.connect(sigc::mem_fun(this, &FilterBasicButton::UpdateScale));
   Settings::Instance().font_scaling.changed.connect(sigc::hide(sigc::mem_fun(this, &FilterBasicButton::InitTheme)));
+=======
+
+  scale.changed.connect(sigc::mem_fun(this, &FilterBasicButton::UpdateScale));
+>>>>>>> MERGE-SOURCE
 }
 
 void FilterBasicButton::InitTheme()
 {
+<<<<<<< TREE
   nux::Geometry const& geo = GetGeometry();
 
   prelight_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
@@ -89,6 +95,20 @@
 
   SetMinimumHeight(BUTTON_HEIGHT.CP(font_scaling));
   SetMaximumHeight(BUTTON_HEIGHT.CP(font_scaling));
+=======
+  nux::Geometry const& geo = GetGeometry();
+
+  prelight_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
+  active_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
+  normal_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &FilterBasicButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
+  focus_.reset(new nux::CairoWrapper(geo, sigc::mem_fun(this, &FilterBasicButton::RedrawFocusOverlay)));
+
+  SetMinimumWidth(MIN_BUTTON_WIDTH.CP(scale));
+  ApplyMinWidth();
+
+  SetMinimumHeight(BUTTON_HEIGHT.CP(scale));
+  SetMaximumHeight(BUTTON_HEIGHT.CP(scale));
+>>>>>>> MERGE-SOURCE
 }
 
 void FilterBasicButton::RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state)

=== modified file 'dash/ScopeBar.cpp'
=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp	2014-08-27 12:55:52 +0000
+++ dash/previews/ActionButton.cpp	2014-12-08 22:41:57 +0000
@@ -49,8 +49,12 @@
   SetAcceptKeyNavFocusOnMouseEnter(true);
   Init();
   BuildLayout(label, icon_hint, "");
+<<<<<<< TREE
   scale.changed.connect(sigc::mem_fun(this, &ActionButton::UpdateScale));
   Settings::Instance().font_scaling.changed.connect(sigc::hide(sigc::mem_fun(this, &ActionButton::InitTheme)));
+=======
+  scale.changed.connect(sigc::mem_fun(this, &ActionButton::UpdateScale));
+>>>>>>> MERGE-SOURCE
 }
 
 ActionButton::~ActionButton()
@@ -86,6 +90,7 @@
 
 void ActionButton::InitTheme()
 {
+<<<<<<< TREE
   nux::Geometry const& geo = GetGeometry();
 
   cr_prelight_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &ActionButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
@@ -96,6 +101,17 @@
   double font_scaling = Settings::Instance().font_scaling() * scale;
   SetMinimumHeight(MIN_BUTTON_HEIGHT.CP(font_scaling));
   SetMinimumWidth(MIN_BUTTON_WIDTH.CP(font_scaling));
+=======
+  nux::Geometry const& geo = GetGeometry();
+
+  cr_prelight_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &ActionButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRELIGHT)));
+  cr_active_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &ActionButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_PRESSED)));
+  cr_normal_.reset(new nux::CairoWrapper(geo, sigc::bind(sigc::mem_fun(this, &ActionButton::RedrawTheme), nux::ButtonVisualState::VISUAL_STATE_NORMAL)));
+  cr_focus_.reset(new nux::CairoWrapper(geo, sigc::mem_fun(this, &ActionButton::RedrawFocusOverlay)));
+
+  SetMinimumHeight(MIN_BUTTON_HEIGHT.CP(scale));
+  SetMinimumWidth(MIN_BUTTON_WIDTH.CP(scale));
+>>>>>>> MERGE-SOURCE
 }
 
 void ActionButton::SetExtraHint(std::string const& extra_hint, std::string const& font_hint)

=== modified file 'dash/previews/ErrorPreview.cpp'
=== modified file 'dash/previews/PaymentPreview.cpp'
=== modified file 'dash/previews/PreviewContainer.cpp'
=== modified file 'dash/previews/PreviewInfoHintWidget.cpp'
=== modified file 'dash/previews/PreviewNavigator.cpp'
=== modified file 'dash/previews/SocialPreviewComments.cpp'
=== modified file 'dash/previews/SocialPreviewContent.cpp'
=== modified file 'dash/previews/Track.cpp'
--- dash/previews/Track.cpp	2014-07-30 00:49:35 +0000
+++ dash/previews/Track.cpp	2014-12-08 22:41:57 +0000
@@ -36,12 +36,22 @@
 namespace previews
 {
 
-namespace
-{
-const RawPixel LAYOUT_SPACING = 6_em;
-const RawPixel TITLE_PADDING = 3_em;
-}
-
+<<<<<<< TREE
+namespace
+{
+const RawPixel LAYOUT_SPACING = 6_em;
+const RawPixel TITLE_PADDING = 3_em;
+}
+
+=======
+DECLARE_LOGGER(logger, "unity.dash.preview.music.track");
+namespace
+{
+const RawPixel LAYOUT_SPACING = 6_em;
+const RawPixel TITLE_PADDING = 3_em;
+}
+
+>>>>>>> MERGE-SOURCE
 class TmpView : public nux::View
 {
 public:

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-28 12:56:29 +0000
+++ debian/changelog	2014-12-08 22:41:57 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 unity (7.3.1+15.04.20141128-0ubuntu1) vivid; urgency=low
 
   [ Andrea Azzarone ]
@@ -318,11 +319,207 @@
     std:vector definition
   * disabled precompiled headers on arm64 Ubuntu package builds (LP:
     #1317276)
+=======
+unity (7.2.3+14.04.20140826-0ubuntu2) UNRELEASED; urgency=medium
+
+  * DecoratedWindow: make edges independent from borders and properly update
+    them on actions change (lp: #1276177), (lp: #1299741), (lp: #1301776),
+    (lp: #1324104), (lp: #1364225), (lp: #1373695)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Mon, 08 Dec 2014 17:35:27 -0500
+
+unity (7.2.3+14.04.20140826-0ubuntu1) trusty; urgency=medium
+
+  [ Andrea Azzarone ]
+  * Remove cross fade effect during lock/unlocking. A simple fading
+    works just fine. (LP: #1312107)
+  * Manually emit nux::Area::geometry_changed beucase nux can fail to
+    emit it. (LP: #1292391)
+
+  [ Pawel Szubert ]
+  * Reduce the scope of the kill command when restarting Compiz.
+    (LP: #1324114)
+
+  [ Marco Trevisan (Treviño) ]
+  * LockScreenAcceleratorController: do ther configured action on power
+    special keys press. We finally can suspend, shutdown, hibernate or
+    start the screensaver when the screen is locked, using the Suspend,
+    Sleep, Hibernate and PowerOff hardware keys. Also the Shutdown
+    dialog doesn't allow now to lock the session if it is not allowed by
+    settings. (LP: #1306211) (LP: #1320051) (LP: #1320071)
+  * Previews: scale the dash preview contents to match current monitor
+    scaling. Improved also the scaling of search-bar, spinner, categories
+    and many other components. (LP: #1339629)
+  * FilterWidgets: add support for scaling (LP: #1340171)
+  * OverlayRendering: correctly scale the overlays borders and edges to
+    match settings. DashStyle has been modified to return smart pointers
+    of textures that are loaded depending on the scale level. The cache
+    will make sure that we don't duplicate the textures and that they
+    get removed when not needed anymore. Also thanks to this the
+    SearchBarSpinner textures (and the other spinners as well) uses the
+    SVGs scaled at the proper size (I desgined a new SVG for the
+    magnifier, as we only had a PNG). (LP: #1283415) (LP: #1340394)
+  * Hud: scale to match current DPI settings for monitor. (LP: #1340477)
+
+  [ Eleni Maria Stea ]
+  * Previews: scale the dash preview contents to match current monitor
+    scaling. Improved also the scaling of search-bar, spinner, categories
+    and many other components. (LP: #1339629)
+
+  [ Stephen M. Webb ]
+  * Reduce the scope of the kill command when restarting Compiz.
+    (LP: #1324114)
+
+  [ Chris Townsend ]
+  * Bump version to 7.2.3.
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 26 Aug 2014 13:49:00 +0000
+
+unity (7.2.2+14.04.20140714-0ubuntu2) trusty; urgency=medium
+
+  [ Andrea Azzarone ]
+  * Remove cross fade effect during lock/unlocking. A simple fading
+    works just fine. (LP: #1312107)
+  * Manually emit nux::Area::geometry_changed beucase nux can fail to
+    emit it. (LP: #1292391)
+  * TextInput: use GdkKeymap to check the caps-lock status (LP: #1347735)
+
+  [ Pawel Szubert ]
+  * Reduce the scope of the kill command when restarting Compiz.
+    (LP: #1324114)
+
+  [ Marco Trevisan (Treviño) ]
+  * LockScreenAcceleratorController: do ther configured action on power
+    special keys press. We finally can suspend, shutdown, hibernate or
+    start the screensaver when the screen is locked, using the Suspend,
+    Sleep, Hibernate and PowerOff hardware keys. Also the Shutdown
+    dialog doesn't allow now to lock the session if it is not allowed by
+    settings. (LP: #1306211) (LP: #1320051) (LP: #1320071)
+  * Previews: scale the dash preview contents to match current monitor
+    scaling. Improved also the scaling of search-bar, spinner, categories
+    and many other components. (LP: #1339629)
+  * FilterWidgets: add support for scaling (LP: #1340171)
+  * OverlayRendering: correctly scale the overlays borders and edges to
+    match settings. DashStyle has been modified to return smart pointers
+    of textures that are loaded depending on the scale level. The cache
+    will make sure that we don't duplicate the textures and that they
+    get removed when not needed anymore. Also thanks to this the
+    SearchBarSpinner textures (and the other spinners as well) uses the
+    SVGs scaled at the proper size (I desgined a new SVG for the
+    magnifier, as we only had a PNG). (LP: #1283415) (LP: #1340394)
+  * Hud: scale to match current DPI settings for monitor. (LP: #1340477)
+  * PlacesOverlayVScrollBar and VScrollBarOverlayWindow: add support for
+    scaling. Add a new ScrollView class to create ScrollViews with an
+    OverlayScrollbar and with scaling support. Using them in dash Scopes and
+    Previews. (LP: #1340996)
+  * LockScreenShield: Add GrabScreen function and retry to make sure we really
+    get the grab. It might happen that the grab is not possible because the
+    PluginAdapter::IsScreenGrabbed request has still not being fully processed,
+    and thus nux is not able to grab the pointer/keyboard. By doing this we
+    instead try to grab the screen, and if this is not happening, we wait a
+    little until we don't get the ungrab event. In this way, if we eventually
+    get the grab, all will work as expected. Otherwise, we cancel the lock
+    request (very unlikely to happen). (LP: #1349128)
+  * PlacesOverlayVScrollBar: redirect the mouse wheel scroll events coming from
+    the thumb to the scrollview. This will make the scrollview to handle then and
+    perform the same scrolling action it would do otherwise. (LP: #1340992)
+  * SwitcherView, PanelService: correctly handle horizontal and vertical scroll
+    events (LP: #1342208) (LP: #1342731)
+
+  [ Eleni Maria Stea ]
+  * Previews: scale the dash preview contents to match current monitor
+    scaling. Improved also the scaling of search-bar, spinner, categories
+    and many other components. (LP: #1339629)
+
+  [ Stephen M. Webb ]
+  * Reduce the scope of the kill command when restarting Compiz.
+    (LP: #1324114)
+
+ -- Chris Townsend <[e-mail]>  Wed, 23 Jul 2014 11:49:11 -0400
+
+unity (7.2.2+14.04.20140714-0ubuntu1.1) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: more screen locking fixes (LP: #1349128)
+    - debian/patches/lp1349128.patch: flush after ungrabbing the keyboard
+      in unity-shared/PluginAdapter.cpp, add GrabScreen() function that
+      retries to lockscreen/LockScreenController.cpp,
+      lockscreen/LockScreenShield.cpp, lockscreen/LockScreenShield.h.
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 30 Jul 2014 15:13:41 -0400
+
+unity (7.2.2+14.04.20140714-0ubuntu1) trusty; urgency=medium
+
+  [ Alfred Neumayer ]
+  * Restore the launcher position by reversing the animation and
+    unsetting the DND_PUSHED_OFF quirk. (LP: #1304882)
+
+  [ Brandon Schaefer ]
+  * TextInput: move the warning icon inside the input field, render it
+    white (LP: #1307738)
+  * ShutdownView: Scale up the Buttons and Text plus Borders of the
+    UnityWindowView. (LP: #1308323)
+  * Lockscreen warning icon needs a tooltip to say what the warning is
+    about! (LP: #1308288)
+
+  [ Marco Trevisan (Treviño) ]
+  * UnityScreen: always paint the lockscreen above, just add menu and
+    onboard as exceptions Some code cleanup, factorizing similar code.
+    (LP: #1313280)
+  * ApplicationLauncherIcon: Focus and, in case, Spread the windows on
+    DnD After 1 second that an user is over an icon, that icon should
+    focus the relative application and Spread its windows if it has more
+    than one opened. Correctly handle the DnD scale in launcher, and
+    apply glow to the icon under pointer. (LP: #607796)
+  * ShutdownView: Scale up the Buttons and Text plus Borders of the
+    UnityWindowView. (LP: #1308323)
+  * SwitcherView: use RawPixel's for the size values and convert them to
+    match current scaling (LP: #1317348)
+  * PluginAdapter: try to grab the screen to make sure that the screen
+    is not grabbed FocusIn event with NotifyGrab mode is not always
+    triggered by X when a window takes the grab, then we need to ensure
+    that there's no grab by trying to get one. We only care about
+    keyboard here, since pointer grabs don't affect us in general.
+    (LP: #741869)
+  * ShortcutView: use RawPixel's for the size values and convert them to
+    match current scaling Plus dinamically allocate horizontal space,
+    not to cut the text. (LP: #924840)
+
+  [ Chris Townsend ]
+  * Fix issue where scaling the edge illumination up and down with the
+    size of the Launcher icons would cause the illumination border to be
+    offset and smaller than the icon. (LP: #1309739) 
+  * Fix issue where the number of Launcher icon pips are not always
+    properly updated when a new window of an already running application
+    is opened. (LP: #1283775)
+  * Fix issue where the Panel shadow would get drawn over drop down
+    windows in full screen windows. (LP: #1316005)
+  * Bump upstream release to 7.2.2.
+
+  [ Andrea Azzarone ]
+  * Clear the clipboard when locking the screen. (LP: #1308911)
+  * Disable switcher gestures if screen is locked. Fixed a regression.
+    (LP: #1321043)
+  * Pass the correct options to showLauncherKeyTerminate in
+    UnityScreen::OnLockScreen (LP: #1320438)
+  * Fix skype indicator blinking. (LP: #1310200)
+  * Add a warning in the session dialog if other sessions are still
+    open. (LP: #1281058)
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 14 Jul 2014 14:31:00 +0000
+
+unity (7.2.1+14.04.20140513-0ubuntu2) trusty; urgency=medium
+>>>>>>> MERGE-SOURCE
 
   [ Brandon Schaefer ]
   * Set the max width, so our static text wraps. So we don't end up
     rendering text out of the view area. (LP: #1312749)
 
+  [ Jnkyu Yi ]
+  * fixed range of blacklisted Unicode characters (lp: #1251193)
+
   [ Marco Trevisan (Treviño) ]
   * UnityScreen: toggle activation of all the unity compiz actions when
     locking the screen Also, make sure that the lockscreen views are
@@ -334,38 +531,23 @@
     focus. This will make possible to see menus also when there's a key-
     grab (although they will be without keyboard support). Finally,
     reset the menu state, if that failed.
-  * UnityScreen: always paint the lockscreen above, just add menu and
-    onboard as exceptions Some code cleanup, factorizing similar code.
-    (LP: #1313280)
-  * UnityScreen: don't try to show Dash/Hud if the screen is grabbed
-    Also move the dash opening out from LauncherController, and get rid
-    of UBus as first initialization source, as it can only slow things
-    down here. (LP: #741869)
   * PluginAdapter: make sure we don't try to call an invalid
     initiate/terminate callback function (LP: #1221673)
   * DebugDBusInterface: match properties if they are in the AP array
     form [<type>, <value>] (LP: #1307748)
 
+  [ Stephen M. Webb ]
+  * lockscreen/LockScreenAccelerators.h: added required header for
+    std:vector definition (fixes FTBFS in Ubuntu)
+  * disabled precompiled headers on arm64 Ubuntu package builds
+    (lp: #1317276)
+  * bump upstream release to 7.2.1
+
   [ William Hua ]
-  * Add proper support for modifier-only shortcuts on the lock screen.
-    (LP: #1291461)
-
-  [ Jinkyu Yi ]
-  * Dash: Fix problem at checking blacklisted unicode range (LP:
-    #1251193)
-
-  [ Andrea Azzarone ]
-  * Add a warning in the session dialog if other sessions are still
-    open. (LP: #1281058)
-
- -- Ubuntu daily release <[e-mail]>  Mon, 12 May 2014 22:03:27 +0000
-
-unity (7.2.0+14.04.20140423-0ubuntu2) utopic; urgency=medium
-
-  * debian/control: depends on autopilot-desktop-legacy rather than
-    autopilot-desktop.
-
- -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 01 May 2014 00:32:05 -0400
+  * added proper support for modifier-only shortcuts on the lock screen
+    (lp: #1291461)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 13 May 2014 20:46:01 +0000
 
 unity (7.2.0+14.04.20140423-0ubuntu1.2) trusty-security; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2014-11-04 18:57:33 +0000
+++ debian/control	2014-12-08 22:41:57 +0000
@@ -179,7 +179,7 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python:Depends},
-         autopilot-desktop-legacy,
+         autopilot-desktop,
          python-windowmocker,
          gir1.2-appindicator3-0.1,
          gir1.2-dee-1.0,

=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp	2014-11-28 12:55:13 +0000
+++ decorations/DecoratedWindow.cpp	2014-12-08 22:41:57 +0000
@@ -109,6 +109,7 @@
 
 void Window::Impl::Update()
 {
+<<<<<<< TREE
   UpdateElements();
 
   if (deco_elements_ & (cu::DecorationElement::EDGE | cu::DecorationElement::BORDER))
@@ -118,6 +119,12 @@
 
   last_mwm_decor_ = win_->mwmDecor();
   last_actions_ = win_->actions();
+=======
+  UpdateElements();
+  (deco_elements_ & (cu::DecorationElement::EDGE | cu::DecorationElement::BORDER)) ? Decorate() : Undecorate();
+  last_mwm_decor_ = win_->mwmDecor();
+  last_actions_ = win_->actions();
+>>>>>>> MERGE-SOURCE
 }
 
 void Window::Impl::Decorate()
@@ -435,6 +442,7 @@
   return (win_->state() & MAXIMIZE_STATE) == MAXIMIZE_STATE;
 }
 
+<<<<<<< TREE
 void Window::Impl::UpdateElements(cu::WindowFilter::Value wf)
 {
   if (!parent_->scaled() && IsMaximized())
@@ -446,6 +454,19 @@
   deco_elements_ = cu::WindowDecorationElements(win_, wf);
 }
 
+=======
+void Window::Impl::UpdateElements()
+{
+  if (!parent_->scaled() && IsMaximized())
+  {
+    deco_elements_ = cu::DecorationElement::NONE;
+    return;
+  }
+
+  deco_elements_ = cu::WindowDecorationElements(win_);
+}
+
+>>>>>>> MERGE-SOURCE
 bool Window::Impl::ShadowDecorated() const
 {
   return deco_elements_ & cu::DecorationElement::SHADOW;
@@ -632,11 +653,17 @@
                          GLWindowPaintAttrib const& attrib,
                          CompRegion const& region, unsigned mask)
 {
+<<<<<<< TREE
   if (!(mask & PAINT_SCREEN_TRANSFORMED_MASK) && win_->defaultViewport() != screen->vp())
   {
     return;
   }
 
+=======
+  if (win_->defaultViewport() != screen->vp())
+    return;
+
+>>>>>>> MERGE-SOURCE
   if (dirty_geo_)
     parent_->UpdateDecorationPosition();
 
@@ -653,8 +680,12 @@
                         GLWindowPaintAttrib const& attrib,
                         CompRegion const& region, unsigned mask)
 {
+<<<<<<< TREE
   if (last_shadow_rect_.isEmpty() || (!(mask & PAINT_SCREEN_TRANSFORMED_MASK) && win_->defaultViewport() != screen->vp()))
   {
+=======
+  if (last_shadow_rect_.isEmpty() || win_->defaultViewport() != screen->vp())
+>>>>>>> MERGE-SOURCE
     return;
   }
 

=== modified file 'decorations/DecorationsForceQuitDialog.cpp'
=== modified file 'decorations/DecorationsManager.cpp'
=== modified file 'decorations/DecorationsPriv.h'
--- decorations/DecorationsPriv.h	2014-10-22 14:38:06 +0000
+++ decorations/DecorationsPriv.h	2014-12-08 22:41:57 +0000
@@ -93,7 +93,11 @@
 private:
   void UnsetExtents();
   void SetupExtents();
+<<<<<<< TREE
   void UpdateElements(cu::WindowFilter::Value wf = cu::WindowFilter::NONE);
+=======
+  void UpdateElements();
+>>>>>>> MERGE-SOURCE
   void UpdateMonitor();
   void UpdateFrame();
   void CreateFrame(nux::Geometry const&);

=== modified file 'hud/HudButton.cpp'
--- hud/HudButton.cpp	2014-07-30 00:49:35 +0000
+++ hud/HudButton.cpp	2014-12-08 22:41:57 +0000
@@ -37,15 +37,28 @@
 #include "HudButton.h"
 #include "HudPrivate.h"
 
-namespace unity
-{
-namespace hud
-{
-
-namespace
-{
-const RawPixel HLAYOUT_LEFT_PADDING = 46_em;
-const RawPixel HEIGHT = 42_em;
+<<<<<<< TREE
+namespace unity
+{
+namespace hud
+{
+
+namespace
+{
+const RawPixel HLAYOUT_LEFT_PADDING = 46_em;
+const RawPixel HEIGHT = 42_em;
+=======
+namespace unity
+{
+namespace hud
+{
+
+namespace
+{
+DECLARE_LOGGER(logger, "unity.hud.button");
+const RawPixel HLAYOUT_LEFT_PADDING = 46_em;
+const RawPixel HEIGHT = 42_em;
+>>>>>>> MERGE-SOURCE
 const char* const button_font = "Ubuntu 13"; // 17px = 13
 }
 

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2014-07-30 13:05:51 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2014-12-08 22:41:57 +0000
@@ -1161,6 +1161,7 @@
 
 void ApplicationLauncherIcon::OnDndEnter()
 {
+<<<<<<< TREE
   auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
 
   _source_manager.AddTimeout(1000, [this, timestamp] {
@@ -1175,6 +1176,21 @@
     if (GetWindows(WindowFilter::ON_CURRENT_DESKTOP).size() > 1)
       Spread(true, COMPIZ_SCALE_DND_SPREAD, false);
 
+=======
+  auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
+
+  _source_manager.AddTimeout(1000, [this, timestamp] {
+    WindowManager::Default().TerminateScale();
+
+    if (!IsRunning())
+      return false;
+
+    Focus(ActionArg(ActionArg::Source::LAUNCHER, 1, timestamp));
+
+    if (GetWindows(WindowFilter::ON_CURRENT_DESKTOP).size() > 1)
+      Spread(true, COMPIZ_SCALE_DND_SPREAD, false);
+
+>>>>>>> MERGE-SOURCE
     return false;
   }, ICON_DND_OVER_TIMEOUT);
 }

=== modified file 'launcher/Launcher.cpp'
=== modified file 'launcher/LauncherIcon.cpp'
=== modified file 'launcher/LauncherIcon.h'
=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2014-09-04 22:11:18 +0000
+++ launcher/SwitcherView.cpp	2014-12-08 22:41:57 +0000
@@ -78,8 +78,13 @@
   icon_renderer_->SetTargetSize(tile_size, icon_size, minimum_spacing);
   icon_renderer_->scale = scale();
 
+<<<<<<< TREE
   text_view_->SetMaximumWidth(tile_size * TEXT_TILE_MULTIPLIER);
   text_view_->SetLines(-1);
+=======
+  text_view_->SetMaximumWidth(tile_size * TEXT_TILE_MULTIPLIER);
+  text_view_->SetLines(1);
+>>>>>>> MERGE-SOURCE
   text_view_->SetTextColor(nux::color::White);
   text_view_->SetFont("Ubuntu Bold 10");
   text_view_->SetScale(scale);
@@ -176,6 +181,7 @@
     text_view_->SetText(model->Selection()->tooltip_text(), true);
 }
 
+<<<<<<< TREE
 void SwitcherView::OnIconSizeChanged(int size)
 {
   icon_renderer_->SetTargetSize(tile_size, icon_size, minimum_spacing);
@@ -198,6 +204,29 @@
   text_size = TEXT_SIZE.CP(scale);
   vertical_size = tile_size + VERTICAL_PADDING.CP(scale) * 2;
   icon_renderer_->scale = scale;
+=======
+void SwitcherView::OnIconSizeChanged(int size)
+{
+  icon_renderer_->SetTargetSize(tile_size, icon_size, minimum_spacing);
+}
+
+void SwitcherView::OnTileSizeChanged(int size)
+{
+  icon_renderer_->SetTargetSize(tile_size, icon_size, minimum_spacing);
+  vertical_size = tile_size + VERTICAL_PADDING.CP(scale) * 2;
+}
+
+void SwitcherView::OnScaleChanged(double scale)
+{
+  text_view_->SetScale(scale);
+  border_size = BORDER_SIZE.CP(scale);
+  flat_spacing = FLAT_SPACING.CP(scale);
+  icon_size = ICON_SIZE.CP(scale);
+  minimum_spacing = MINIMUM_SPACING.CP(scale);
+  tile_size = TILE_SIZE.CP(scale);
+  text_size = TEXT_SIZE.CP(scale);
+  vertical_size = tile_size + VERTICAL_PADDING.CP(scale) * 2;
+>>>>>>> MERGE-SOURCE
 }
 
 void SwitcherView::StartAnimation()

=== modified file 'launcher/VolumeLauncherIcon.cpp'
=== modified file 'lockscreen/LockScreenAbstractShield.h'
=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2014-10-21 18:55:37 +0000
+++ lockscreen/LockScreenController.cpp	2014-12-08 22:41:57 +0000
@@ -239,12 +239,21 @@
       is_new = true;
     }
 
+<<<<<<< TREE
     auto old_geo = shield->GetGeometry();
     auto new_geo = monitors[i];
 
     shield->SetGeometry(new_geo);
     shield->SetMinMaxSize(new_geo.width, new_geo.height);
     shield->primary = false;
+=======
+    auto old_geo = shield->GetGeometry();
+    auto new_geo = monitors[i];
+
+    shield->SetGeometry(new_geo);
+    shield->SetMinMaxSize(new_geo.width, new_geo.height);
+    shield->primary = (i == primary);
+>>>>>>> MERGE-SOURCE
     shield->monitor = i;
 
     // XXX: manually emit nux::Area::geometry_changed beucase nux can fail to emit it.
@@ -382,6 +391,10 @@
       HideBlankWindow();
 
     LockScreen();
+<<<<<<< TREE
+=======
+    session_manager_->is_locked = true;
+>>>>>>> MERGE-SOURCE
 
     if (prompt_activation_)
     {
@@ -442,12 +455,16 @@
   indicators_ = std::make_shared<indicator::LockScreenDBusIndicators>();
   upstart_wrapper_->Emit("desktop-lock");
 
+<<<<<<< TREE
   shutdown_notifier_ = std::make_shared<ShutdownNotifier>();
   shutdown_notifier_->RegisterInterest([](){
     WindowManager::Default().UnmapAllNoNuxWindowsSync();
   });
 
   accelerator_controller_ = std::make_shared<AcceleratorController>(session_manager_);
+=======
+  accelerator_controller_ = std::make_shared<AcceleratorController>(session_manager_);
+>>>>>>> MERGE-SOURCE
   auto activate_key = WindowManager::Default().activate_indicators_key();
   auto accelerator = std::make_shared<Accelerator>(activate_key.second, 0, activate_key.first);
   accelerator->activated.connect(std::bind(std::mem_fn(&Controller::ActivatePanel), this));

=== modified file 'lockscreen/LockScreenShield.cpp'
--- lockscreen/LockScreenShield.cpp	2014-09-19 20:44:05 +0000
+++ lockscreen/LockScreenShield.cpp	2014-12-08 22:41:57 +0000
@@ -19,6 +19,7 @@
 
 #include "LockScreenShield.h"
 
+#include <NuxCore/Logger.h>
 #include <Nux/VLayout.h>
 #include <Nux/HLayout.h>
 #include <Nux/PaintLayer.h>
@@ -36,10 +37,18 @@
 {
 namespace lockscreen
 {
+<<<<<<< TREE
 namespace
 {
 const unsigned MAX_GRAB_WAIT = 100;
 }
+=======
+namespace
+{
+DECLARE_LOGGER(logger, "unity.lockscreen.shield");
+const unsigned MAX_GRAB_WAIT = 50;
+}
+>>>>>>> MERGE-SOURCE
 
 Shield::Shield(session::Manager::Ptr const& session_manager,
                indicator::Indicators::Ptr const& indicators,
@@ -113,6 +122,7 @@
   }
 }
 
+<<<<<<< TREE
 void Shield::GrabScreen(bool cancel_on_failure)
 {
   auto& wc = nux::GetWindowCompositor();
@@ -142,12 +152,38 @@
 {
   auto& wc = nux::GetWindowCompositor();
   return (wc.GetPointerGrabArea() == this && wc.GetKeyboardGrabArea() == this);
+=======
+void Shield::GrabScreen(bool cancel_on_failure)
+{
+  auto& wc = nux::GetWindowCompositor();
+
+  if (wc.GrabPointerAdd(this) && wc.GrabKeyboardAdd(this))
+  {
+    regrab_conn_->disconnect();
+    regrab_timeout_.reset();
+  }
+  else
+  {
+    auto const& retry_cb = sigc::bind(sigc::mem_fun(this, &Shield::GrabScreen), false);
+    regrab_conn_ = WindowManager::Default().screen_ungrabbed.connect(retry_cb);
+
+    if (cancel_on_failure)
+    {
+      regrab_timeout_.reset(new glib::Timeout(MAX_GRAB_WAIT, [this] {
+        LOG_ERROR(logger) << "Impossible to get the grab to lock the screen";
+        session_manager_->unlock_requested.emit();
+        return false;
+      }));
+    }
+  }
+>>>>>>> MERGE-SOURCE
 }
 
 void Shield::ShowPrimaryView()
 {
   if (primary_layout_)
   {
+<<<<<<< TREE
     if (prompt_view_)
     {
       prompt_view_->scale = scale();
@@ -155,6 +191,9 @@
     }
 
     GrabScreen(false);
+=======
+    GrabScreen(false);
+>>>>>>> MERGE-SOURCE
     SetLayout(primary_layout_.GetPointer());
     return;
   }

=== modified file 'lockscreen/LockScreenShield.h'
--- lockscreen/LockScreenShield.h	2014-09-19 18:02:37 +0000
+++ lockscreen/LockScreenShield.h	2014-12-08 22:41:57 +0000
@@ -68,7 +68,12 @@
   nux::ObjectPtr<nux::Layout> cof_layout_;
   connection::Wrapper panel_active_conn_;
   connection::Wrapper regrab_conn_;
-  glib::Source::UniquePtr regrab_timeout_;
+<<<<<<< TREE
+  glib::Source::UniquePtr regrab_timeout_;
+=======
+  glib::Source::UniquePtr regrab_timeout_;
+  UserPromptView* prompt_view_;
+>>>>>>> MERGE-SOURCE
   Panel* panel_view_;
   CofView* cof_view_;
 };

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-08-25 20:46:31 +0000
+++ lockscreen/UserPromptView.cpp	2014-12-08 22:41:57 +0000
@@ -40,10 +40,18 @@
 const RawPixel PADDING              = 10_em;
 const RawPixel LAYOUT_MARGIN        = 10_em;
 const RawPixel MSG_LAYOUT_MARGIN    = 15_em;
+<<<<<<< TREE
 const RawPixel PROMPT_LAYOUT_MARGIN =  5_em;
 const int PROMPT_FONT_SIZE = 13;
 
 nux::AbstractPaintLayer* CrateBackgroundLayer(double width, double height, double scale)
+=======
+const RawPixel PROMPT_LAYOUT_MARGIN =  5_em;
+
+const int PROMPT_FONT_SIZE = 13;
+
+nux::AbstractPaintLayer* CrateBackgroundLayer(int width, int height)
+>>>>>>> MERGE-SOURCE
 {
   nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, width, height);
   cairo_surface_set_device_scale(cg.GetSurface(), scale, scale);
@@ -103,9 +111,12 @@
   : nux::View(NUX_TRACKER_LOCATION)
   , scale(1.0)
   , session_manager_(session_manager)
+<<<<<<< TREE
   , username_(nullptr)
   , msg_layout_(nullptr)
   , prompt_layout_(nullptr)
+=======
+>>>>>>> MERGE-SOURCE
 {
   user_authenticator_.echo_on_requested.connect([this](std::string const& message, PromiseAuthCodePtr const& promise){
     AddPrompt(message, /* visible */ true, promise);
@@ -127,13 +138,17 @@
     ResetLayout();
   });
 
+<<<<<<< TREE
   scale.changed.connect(sigc::hide(sigc::mem_fun(this, &UserPromptView::UpdateSize)));
 
   UpdateSize();
+=======
+>>>>>>> MERGE-SOURCE
   ResetLayout();
 
   user_authenticator_.AuthenticateStart(session_manager_->UserName(),
                                         sigc::mem_fun(this, &UserPromptView::AuthenticationCb));
+<<<<<<< TREE
 }
 
 void UserPromptView::UpdateSize()
@@ -184,6 +199,8 @@
   ComputeContentSize();
   QueueRelayout();
   QueueDraw();
+=======
+>>>>>>> MERGE-SOURCE
 }
 
 bool UserPromptView::InspectKeyEvent(unsigned int eventType, unsigned int key_sym, const char* character)
@@ -317,15 +334,26 @@
   text_input->scale = scale();
   text_input->input_hint = SanitizeMessage(message);
   text_input->hint_font_size = PROMPT_FONT_SIZE;
+<<<<<<< TREE
   text_input->show_caps_lock = true;
   text_input->show_activator = true;
+=======
+  text_input->show_caps_lock = true;
+>>>>>>> MERGE-SOURCE
   text_entry->SetPasswordMode(!visible);
   text_entry->SetPasswordChar("•");
   text_entry->SetToggleCursorVisibilityOnKeyFocus(true);
+<<<<<<< TREE
   text_entry->clipboard_enabled = false;
 
   text_input->SetMinimumHeight(Settings::GRID_SIZE.CP(scale));
   text_input->SetMaximumHeight(Settings::GRID_SIZE.CP(scale));
+=======
+  text_entry->clipboard_enabled = false;
+
+  text_input->SetMinimumHeight(Settings::GRID_SIZE);
+  text_input->SetMaximumHeight(Settings::GRID_SIZE);
+>>>>>>> MERGE-SOURCE
   prompt_layout_->AddView(text_input, 1);
   focus_queue_.push_back(text_input);
 

=== modified file 'lockscreen/UserPromptView.h'
--- lockscreen/UserPromptView.h	2014-07-28 16:58:13 +0000
+++ lockscreen/UserPromptView.h	2014-12-08 22:41:57 +0000
@@ -74,7 +74,14 @@
   StaticCairoText* username_;
   nux::VLayout* msg_layout_;
   nux::VLayout* prompt_layout_;
-  std::deque<TextInput*> focus_queue_;
+<<<<<<< TREE
+  std::deque<TextInput*> focus_queue_;
+=======
+  StaticCairoText* message_;
+  StaticCairoText* error_;
+  StaticCairoText* invalid_login_;
+  std::deque<TextInput*> focus_queue_;
+>>>>>>> MERGE-SOURCE
 
   nux::Geometry cached_focused_geo_;
 };

=== modified file 'panel/PanelIndicatorEntryView.cpp'
=== modified file 'plugins/unityshell/src/unityshell.cpp'
=== modified file 'plugins/unityshell/src/unityshell.h'
=== modified file 'po/unity.pot'
--- po/unity.pot	2014-07-11 17:49:21 +0000
+++ po/unity.pot	2014-12-08 22:41:57 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2013-04-17 16:00+0100\n"
+"POT-Creation-Date: 2014-07-01 11:21-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -38,6 +38,26 @@
 msgid "Last Updated"
 msgstr ""
 
+#. The "%s" is used in the dash preview to display the "<hint>: <value>" infos
+#, c-format
+msgid "%s:"
+msgstr ""
+
+msgid "Comments"
+msgstr ""
+
+msgid "This window is not responding"
+msgstr ""
+
+msgid "Do you want to force the application to exit, or wait for it to respond?"
+msgstr ""
+
+msgid "_Wait"
+msgstr ""
+
+msgid "_Force Quit"
+msgstr ""
+
 msgid "Type your command"
 msgstr ""
 
@@ -50,6 +70,12 @@
 msgid "Quit"
 msgstr ""
 
+msgid "Exit"
+msgstr ""
+
+msgid "Close"
+msgstr ""
+
 msgid "Search your computer and online sources"
 msgstr ""
 
@@ -69,13 +95,16 @@
 msgid "Waiting to install"
 msgstr ""
 
+msgid "Installing…"
+msgstr ""
+
 msgid "Drop To Add Application"
 msgstr ""
 
 msgid "Trash"
 msgstr ""
 
-msgid "Empty Trash..."
+msgid "Empty Trash…"
 msgstr ""
 
 msgid "Open"
@@ -96,6 +125,15 @@
 msgid "Unmount"
 msgstr ""
 
+msgid "Password"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Invalid password, please try again"
+msgstr ""
+
 msgid "Ubuntu Desktop"
 msgstr ""
 
@@ -105,6 +143,14 @@
 msgid "Launcher"
 msgstr ""
 
+#, c-format
+msgid "%s: running: %zu windows open"
+msgstr ""
+
+#, c-format
+msgid "%s: running"
+msgstr ""
+
 msgid "Quicklist"
 msgstr ""
 
@@ -165,6 +211,9 @@
 msgid "Opens the Dash Music Lens."
 msgstr ""
 
+msgid "Opens the Dash Photo Lens."
+msgstr ""
+
 msgid "Opens the Dash Video Lens."
 msgstr ""
 
@@ -210,6 +259,9 @@
 msgid "Switches between applications."
 msgstr ""
 
+msgid "Switches between applications from all workspaces."
+msgstr ""
+
 msgid "Switches windows of current applications."
 msgstr ""
 
@@ -234,6 +286,12 @@
 msgid "Spreads all windows in the current workspace."
 msgstr ""
 
+msgid "Spreads all windows."
+msgstr ""
+
+msgid "Spreads all windows in all the workspaces."
+msgstr ""
+
 msgid "Minimises all windows."
 msgstr ""
 
@@ -258,7 +316,7 @@
 msgid "Places the window in corresponding position."
 msgstr ""
 
-msgid "Ctrl + Alt + Num"
+msgid "Ctrl + Alt + Num (keypad)"
 msgstr ""
 
 msgid " Drag"
@@ -270,6 +328,11 @@
 msgid "Resizes the window."
 msgstr ""
 
+msgid ""
+"Other users are logged in. Restarting or shutting down will close their open applications and may cause them to lose work.\n"
+"\n"
+msgstr ""
+
 msgid "Shut Down"
 msgstr ""
 
@@ -327,3 +390,7 @@
 
 msgid "Filter results"
 msgstr ""
+
+#. avoid wrap lines
+msgid "Caps lock is on"
+msgstr ""

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2014-11-28 12:55:58 +0000
+++ services/panel-service.c	2014-12-08 22:41:57 +0000
@@ -2506,6 +2506,7 @@
   entry = get_indicator_entry_by_id (self, entry_id);
   g_return_if_fail (entry);
 
+<<<<<<< TREE
   GdkScrollDirection direction = G_MAXINT;
 
   switch (delta)
@@ -2541,4 +2542,30 @@
     {
       gtk_menu_popdown (GTK_MENU (self->priv->last_menu));
     }
+=======
+  GdkScrollDirection direction = G_MAXINT;
+
+  switch (delta)
+    {
+      case NUX_VERTICAL_SCROLL_DELTA:
+        direction = INDICATOR_OBJECT_SCROLL_UP;
+        break;
+      case -NUX_VERTICAL_SCROLL_DELTA:
+        direction = INDICATOR_OBJECT_SCROLL_DOWN;
+        break;
+      case NUX_HORIZONTAL_SCROLL_DELTA:
+        direction = INDICATOR_OBJECT_SCROLL_LEFT;
+        break;
+      case -NUX_HORIZONTAL_SCROLL_DELTA:
+        direction = INDICATOR_OBJECT_SCROLL_RIGHT;
+        break;
+      }
+
+  if (direction != G_MAXINT)
+    {
+      object = get_entry_parent_indicator (entry);
+      g_signal_emit_by_name(object, INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED,
+                            entry, 1, direction);
+    }
+>>>>>>> MERGE-SOURCE
 }

=== modified file 'tests/test_lockscreen_controller.cpp'
=== modified file 'unity-shared/CompizUtils.cpp'
--- unity-shared/CompizUtils.cpp	2014-10-22 13:58:46 +0000
+++ unity-shared/CompizUtils.cpp	2014-12-08 22:41:57 +0000
@@ -174,6 +174,7 @@
   return cairo_xlib_surface_get_height(surface_);
 }
 
+<<<<<<< TREE
 //
 //
 
@@ -229,8 +230,69 @@
 }
 
 bool IsWindowShadowDecorable(CompWindow* win)
-{
-  return WindowDecorationElements(win) & DecorationElement::SHADOW;
+=======
+//
+//
+
+unsigned WindowDecorationElements(CompWindow* win)
+>>>>>>> MERGE-SOURCE
+{
+<<<<<<< TREE
+  return WindowDecorationElements(win) & DecorationElement::SHADOW;
+=======
+  unsigned elements = DecorationElement::NONE;
+
+  if (!win)
+    return elements;
+
+  if (!win->isViewable())
+    return elements;
+
+  if (win->wmType() & (CompWindowTypeDockMask | CompWindowTypeDesktopMask))
+    return elements;
+
+  if (win->inShowDesktopMode())
+    return elements;
+
+  auto const& region = win->region();
+  bool rectangular = (region.numRects() == 1);
+  bool alpha = win->alpha();
+
+  if (!rectangular && alpha) // Non-rectangular windows with alpha channel
+    return elements;
+
+  if (region.boundingRect() != win->geometry()) // Shaped windows
+    return elements;
+
+  if (rectangular)
+    elements |= DecorationElement::SHADOW;
+
+  if (!win->overrideRedirect() &&
+      (win->type() & DECORABLE_WINDOW_TYPES) &&
+      (win->frame() || win->hasUnmapReference()))
+  {
+    if (win->actions() & CompWindowActionResizeMask)
+      elements |= DecorationElement::EDGE;
+
+    if (rectangular && (win->mwmDecor() & (MwmDecorAll | MwmDecorTitle)))
+      elements |= DecorationElement::BORDER;
+  }
+
+  if (alpha && !(elements & DecorationElement::BORDER) && !(win->mwmDecor() & MwmDecorBorder))
+    elements &= ~DecorationElement::SHADOW;
+
+  return elements;
+}
+
+bool IsWindowEdgeDecorable(CompWindow* win)
+{
+  return WindowDecorationElements(win) & DecorationElement::EDGE;
+}
+
+bool IsWindowShadowDecorable(CompWindow* win)
+{
+  return WindowDecorationElements(win) & DecorationElement::SHADOW;
+>>>>>>> MERGE-SOURCE
 }
 
 bool IsWindowFullyDecorable(CompWindow* win)

=== modified file 'unity-shared/CompizUtils.h'
--- unity-shared/CompizUtils.h	2014-10-22 13:58:46 +0000
+++ unity-shared/CompizUtils.h	2014-12-08 22:41:57 +0000
@@ -119,6 +119,7 @@
   cairo_t *cr_;
 };
 
+<<<<<<< TREE
 namespace WindowFilter
 {
 enum Value
@@ -143,6 +144,20 @@
 unsigned WindowDecorationElements(CompWindow*, WindowFilter::Value wf = WindowFilter::NONE);
 
 bool IsWindowEdgeDecorable(CompWindow*);
+=======
+enum DecorationElement
+{
+  NONE = 0,
+  EDGE = (1 << 0),
+  SHADOW = (1 << 1),
+  BORDER = (1 << 2),
+  FULL = EDGE|SHADOW|BORDER
+};
+
+unsigned WindowDecorationElements(CompWindow*);
+
+bool IsWindowEdgeDecorable(CompWindow*);
+>>>>>>> MERGE-SOURCE
 bool IsWindowShadowDecorable(CompWindow*);
 bool IsWindowFullyDecorable(CompWindow*);
 

=== modified file 'unity-shared/DashStyle.cpp'
=== modified file 'unity-shared/IconTexture.cpp'
=== modified file 'unity-shared/PluginAdapter.cpp'
=== modified file 'unity-shared/SearchBar.cpp'
--- unity-shared/SearchBar.cpp	2014-09-04 22:11:33 +0000
+++ unity-shared/SearchBar.cpp	2014-12-08 22:41:57 +0000
@@ -336,10 +336,17 @@
   pango_entry_->SetMaximumHeight(entry_min);
   layered_layout_->SetMinimumHeight(entry_min);
   layered_layout_->SetMaximumHeight(entry_min);
+<<<<<<< TREE
 
   int search_bar_height = style.GetSearchBarHeight().CP(font_scaling);
   SetMinimumHeight(search_bar_height);
   SetMaximumHeight(search_bar_height);
+=======
+
+  int search_bar_height = style.GetSearchBarHeight().CP(scale);
+  SetMinimumHeight(search_bar_height);
+  SetMaximumHeight(search_bar_height);
+>>>>>>> MERGE-SOURCE
 }
 
 void SearchBar::UpdateScale(double scale)

=== modified file 'unity-shared/SearchBarSpinner.h'
=== modified file 'unity-shared/SpreadFilter.cpp'
=== modified file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	2014-09-04 22:11:03 +0000
+++ unity-shared/TextInput.cpp	2014-12-08 22:41:57 +0000
@@ -19,6 +19,13 @@
 
 #include "config.h"
 #include "TextInput.h"
+#include "unity-shared/IconTexture.h"
+#include "unity-shared/DashStyle.h"
+#include "unity-shared/RawPixel.h"
+#include "unity-shared/PreviewStyle.h"
+
+namespace unity
+{
 
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
@@ -43,6 +50,7 @@
 
 namespace
 {
+<<<<<<< TREE
 const int BORDER_RADIUS = 5;
 const int TOOLTIP_WAIT = 500;
 const RawPixel SPACE_BETWEEN_ENTRY_AND_HIGHLIGHT = 10_em;
@@ -55,13 +63,35 @@
 const RawPixel DEFAULT_ICON_SIZE = 22_em;
 
 std::string WARNING_ICON    = "dialog-warning-symbolic";
+=======
+const float kExpandDefaultIconOpacity = 1.0f;
+
+const int SPACE_BETWEEN_ENTRY_AND_HIGHLIGHT = 10;
+const int LEFT_INTERNAL_PADDING = 6;
+const int TEXT_INPUT_RIGHT_BORDER = 10;
+
+const int HIGHLIGHT_HEIGHT = 24;
+
+const RawPixel TOOLTIP_Y_OFFSET  =  3_em;
+const RawPixel TOOLTIP_OFFSET    = 10_em;
+const RawPixel DEFAULT_ICON_SIZE = 22_em;
+
+std::string WARNING_ICON    = "dialog-warning-symbolic";
+>>>>>>> MERGE-SOURCE
 // Fonts
 const std::string HINT_LABEL_DEFAULT_FONT_NAME = "Ubuntu";
 const int HINT_LABEL_FONT_SIZE = 11;
 
 const std::string PANGO_ENTRY_DEFAULT_FONT_FAMILY = "Ubuntu";
+<<<<<<< TREE
 const RawPixel PANGO_ENTRY_FONT_SIZE = 14_em;
 
+=======
+const int PANGO_ENTRY_FONT_SIZE = 14;
+
+}
+
+>>>>>>> MERGE-SOURCE
 nux::logging::Logger logger("unity.textinput");
 
 std::shared_ptr<nux::AbstractPaintLayer> CreateWarningLayer(nux::BaseTexture* texture)
@@ -86,18 +116,46 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(TextInput);
 
+nux::AbstractPaintLayer* CreateWarningLayer(nux::BaseTexture* texture)
+{
+  // Create the texture layer
+  nux::TexCoordXForm texxform;
+
+  texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+  texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+  texxform.min_filter = nux::TEXFILTER_LINEAR;
+  texxform.mag_filter = nux::TEXFILTER_LINEAR;
+
+  nux::ROPConfig rop;
+  rop.Blend = true;
+
+  rop.SrcBlend = GL_ONE;
+  rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+
+  return (new nux::TextureLayer(texture->GetDeviceTexture(),
+                                texxform,
+                                nux::color::White,
+                                true,
+                                rop));
+}
+
 TextInput::TextInput(NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
   , input_hint("")
   , hint_font_name(HINT_LABEL_DEFAULT_FONT_NAME)
   , hint_font_size(HINT_LABEL_FONT_SIZE)
+<<<<<<< TREE
   , show_activator(false)
   , show_caps_lock(false)
   , scale(1.0)
+=======
+  , show_caps_lock(false)
+>>>>>>> MERGE-SOURCE
   , bg_layer_(new nux::ColorLayer(nux::Color(0xff595853), true))
   , caps_lock_on(false)
   , last_width_(-1)
   , last_height_(-1)
+  , mouse_over_warning_icon_(false)
 {
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
   layout_->SetLeftAndRightPadding(LEFT_INTERNAL_PADDING.CP(scale), TEXT_INPUT_RIGHT_BORDER.CP(scale));
@@ -131,6 +189,7 @@
   layered_layout_->SetActiveLayerN(1);
   layout_->AddView(layered_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
+<<<<<<< TREE
   UpdateSize();
 
   // Caps lock warning
@@ -164,6 +223,27 @@
   });
 
   // Spinner
+=======
+  warning_ = new IconTexture(LoadWarningIcon(DEFAULT_ICON_SIZE));
+  warning_->SetVisible(caps_lock_on());
+  layout_->AddView(warning_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  caps_lock_on.changed.connect([this] (bool on) {
+    if (show_caps_lock)
+    {
+      warning_->SetVisible(on);
+      QueueRelayout();
+      QueueDraw();
+    }
+  });
+
+  show_caps_lock.changed.connect([this] (bool changed) {
+    if (!warning_tooltip_.IsValid())
+      LoadWarningTooltip();
+
+    CheckIfCapsLockOn();
+  });
+
+>>>>>>> MERGE-SOURCE
   spinner_ = new SearchBarSpinner();
   spinner_->SetVisible(false);
   spinner_->scale = scale();
@@ -180,12 +260,17 @@
     CheckIfCapsLockOn();
   });
 
+  sig_manager_.Add<void, GdkKeymap*>(gdk_keymap_get_default(), "state-changed", [this](GdkKeymap*) {
+    CheckIfCapsLockOn();
+  });
+
   input_string.SetGetterFunction(sigc::mem_fun(this, &TextInput::get_input_string));
   input_string.SetSetterFunction(sigc::mem_fun(this, &TextInput::set_input_string));
   im_active.SetGetterFunction(sigc::mem_fun(this, &TextInput::get_im_active));
   im_preedit.SetGetterFunction(sigc::mem_fun(this, &TextInput::get_im_preedit));
   input_hint.changed.connect([this](std::string const& s) { OnInputHintChanged(); });
 
+<<<<<<< TREE
   warning_->mouse_enter.connect([this] (int x, int y, int button, int key_flags) {
     tooltip_timeout_.reset(new glib::Timeout(TOOLTIP_WAIT, [this] {
       tooltip_timeout_.reset();
@@ -232,6 +317,23 @@
 {
   GdkKeymap* keymap = gdk_keymap_get_default();
   caps_lock_on = gdk_keymap_get_caps_lock_state(keymap) == FALSE ? false : true;
+=======
+  warning_->mouse_enter.connect([this] (int x, int y, int button, int key_flags) {
+    mouse_over_warning_icon_ = true;
+    QueueDraw();
+  });
+
+  warning_->mouse_leave.connect([this] (int x, int y, int button, int key_flags) {
+    mouse_over_warning_icon_ = false;
+    QueueDraw();
+  });
+}
+
+void TextInput::CheckIfCapsLockOn()
+{
+  GdkKeymap* keymap = gdk_keymap_get_default();
+  caps_lock_on = gdk_keymap_get_caps_lock_state(keymap) == FALSE ? false : true;
+>>>>>>> MERGE-SOURCE
 }
 
 void TextInput::SetSpinnerVisible(bool visible)
@@ -250,6 +352,7 @@
   hint_->SetFont((hint_font_name() + " " + std::to_string(hint_font_size())).c_str());
 }
 
+<<<<<<< TREE
 nux::ObjectPtr<nux::BaseTexture> TextInput::LoadActivatorIcon(int icon_size)
 {
   TextureCache& cache = TextureCache::GetDefault();
@@ -327,6 +430,78 @@
 }
 
 void TextInput::OnFontChanged()
+=======
+nux::ObjectPtr<nux::BaseTexture> TextInput::LoadWarningIcon(int icon_size)
+{
+  auto* theme = gtk_icon_theme_get_default();
+  GtkIconLookupFlags flags = GTK_ICON_LOOKUP_FORCE_SIZE;
+  glib::Error error;
+  glib::Object<GdkPixbuf> pixbuf(gtk_icon_theme_load_icon(theme, WARNING_ICON.c_str(), icon_size, flags, &error));
+
+  if (pixbuf != nullptr)
+  {
+    nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
+    cairo_t* cr = cg.GetInternalContext();
+
+    cairo_push_group(cr);
+    gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
+    cairo_paint_with_alpha(cr, 1.0);
+    std::shared_ptr<cairo_pattern_t> pat(cairo_pop_group(cr), cairo_pattern_destroy);
+
+    cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
+    cairo_rectangle(cr, 0, 0, gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
+    cairo_mask(cr, pat.get());
+
+    return texture_ptr_from_cairo_graphics(cg);
+  }
+  // Use fallback icon (this one is a png, and does not scale!)
+  else
+  {
+    dash::previews::Style& preview_style = dash::previews::Style::Instance();
+    return nux::ObjectPtr<nux::BaseTexture>(preview_style.GetWarningIcon());
+  }
+}
+
+void TextInput::LoadWarningTooltip()
+{
+  glib::String font_name;
+  g_object_get(gtk_settings_get_default(), "gtk-font-name", &font_name, NULL);
+
+  glib::Object<GtkStyleContext> style_context(gtk_style_context_new());
+  std::shared_ptr<GtkWidgetPath> widget_path(gtk_widget_path_new(), gtk_widget_path_free);
+  gtk_widget_path_append_type(widget_path.get(), GTK_TYPE_TOOLTIP);
+
+  gtk_style_context_set_path(style_context, widget_path.get());
+  gtk_style_context_add_class(style_context, "tooltip");
+
+  glib::Object<PangoLayout> layout;
+  glib::Object<PangoContext> context(gdk_pango_context_get_for_screen(gdk_screen_get_default()));
+  layout = pango_layout_new(context);
+
+  std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font_name), pango_font_description_free);
+  pango_context_set_font_description(context, desc.get());
+  pango_context_set_language(context, gtk_get_default_language());
+
+  pango_layout_set_height(layout, -1); //avoid wrap lines
+  pango_layout_set_text(layout, _("Caps lock is on"), -1);
+
+  nux::Size extents;
+  pango_layout_get_pixel_size(layout, &extents.width, &extents.height);
+  extents.width  += TOOLTIP_OFFSET;
+  extents.height += TOOLTIP_OFFSET;
+
+  nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, extents.width, extents.height);
+  cairo_t* cr = cg.GetInternalContext();
+
+  gtk_render_background(style_context, cr, 0, 0, extents.width, extents.height);
+  gtk_render_frame(style_context, cr, 0, 0, extents.width, extents.height);
+  gtk_render_layout(style_context, cr, TOOLTIP_OFFSET/2, TOOLTIP_OFFSET/2, layout);
+
+  warning_tooltip_ = texture_ptr_from_cairo_graphics(cg);
+}
+
+void TextInput::OnFontChanged(GtkSettings* settings, GParamSpec* pspec)
+>>>>>>> MERGE-SOURCE
 {
   glib::String font_name;
   PangoFontDescription* desc;
@@ -395,9 +570,15 @@
 
   layout_->ProcessDraw(GfxContext, force_draw);
 
+<<<<<<< TREE
   if (caps_lock_on && warning_->IsMouseInside() && !tooltip_timeout_)
     PaintWarningTooltip(GfxContext);
 
+=======
+  if (caps_lock_on && mouse_over_warning_icon_)
+      PaintWarningTooltip(GfxContext);
+
+>>>>>>> MERGE-SOURCE
   if (!IsFullRedraw())
   {
     gPainter.PopBackground();
@@ -410,6 +591,7 @@
   GfxContext.PopClippingRectangle();
 }
 
+<<<<<<< TREE
 void TextInput::PaintWarningTooltip(nux::GraphicsEngine& graphics_engine)
 {
   nux::Geometry const& warning_geo = warning_->GetGeometry();
@@ -426,6 +608,20 @@
   nux::GetPainter().PushDrawLayer(graphics_engine, tooltip_geo, warning_layer.get());
 }
 
+=======
+void TextInput::PaintWarningTooltip(nux::GraphicsEngine& graphics_engine)
+{
+  nux::Geometry warning_geo = warning_->GetGeometry();
+
+  nux::Geometry tooltip_geo = {warning_geo.x - (warning_tooltip_->GetWidth() + TOOLTIP_OFFSET / 2),
+                               warning_geo.y - TOOLTIP_Y_OFFSET,
+                               warning_tooltip_->GetWidth(),
+                               warning_tooltip_->GetHeight()};
+
+  nux::GetPainter().PushDrawLayer(graphics_engine, tooltip_geo, CreateWarningLayer(warning_tooltip_.GetPointer()));
+}
+
+>>>>>>> MERGE-SOURCE
 void TextInput::UpdateBackground(bool force)
 {
   nux::Geometry geo(GetGeometry());

=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h	2014-08-27 22:08:58 +0000
+++ unity-shared/TextInput.h	2014-12-08 22:41:57 +0000
@@ -63,9 +63,13 @@
   nux::Property<int> hint_font_size;
   nux::ROProperty<bool> im_active;
   nux::ROProperty<bool> im_preedit;
+<<<<<<< TREE
   nux::Property<bool> show_activator;
   nux::Property<bool> show_caps_lock;
   nux::Property<double> scale;
+=======
+  nux::Property<bool> show_caps_lock;
+>>>>>>> MERGE-SOURCE
 
 private:
   void OnFontChanged();
@@ -81,6 +85,7 @@
   void AddProperties(debug::IntrospectionData&);
   bool AcceptKeyNavFocus();
 
+<<<<<<< TREE
   bool ShouldBeHighlighted();
 
   nux::Geometry GetWaringIconGeometry() const;
@@ -92,6 +97,18 @@
 
   void PaintWarningTooltip(nux::GraphicsEngine& graphics_engine);
 
+=======
+  bool ShouldBeHighlighted();
+
+  nux::Geometry GetWaringIconGeometry() const;
+  void CheckIfCapsLockOn();
+
+  nux::ObjectPtr<nux::BaseTexture> LoadWarningIcon(int icon_size);
+  void LoadWarningTooltip();
+
+  void PaintWarningTooltip(nux::GraphicsEngine& graphics_engine);
+
+>>>>>>> MERGE-SOURCE
 protected:
   void OnInputHintChanged();
   void OnMouseButtonDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
@@ -119,6 +136,10 @@
   nux::Property<bool> caps_lock_on;
   int last_width_;
   int last_height_;
+  bool mouse_over_warning_icon_;
+
+  IconTexture* warning_;
+  nux::ObjectPtr<nux::BaseTexture> warning_tooltip_;
 
   IconTexture* warning_;
   IconTexture* activator_;

=== modified file 'unity-shared/TextureCache.cpp'
--- unity-shared/TextureCache.cpp	2014-07-30 00:49:35 +0000
+++ unity-shared/TextureCache.cpp	2014-12-08 22:41:57 +0000
@@ -25,15 +25,28 @@
 
 namespace unity
 {
-namespace
-{
-// Stolen from boost
-template <class T>
-inline std::size_t hash_combine(std::size_t seed, T const& v)
-{
-  return seed ^ (std::hash<T>()(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2));
-}
-}
+<<<<<<< TREE
+namespace
+{
+// Stolen from boost
+template <class T>
+inline std::size_t hash_combine(std::size_t seed, T const& v)
+{
+  return seed ^ (std::hash<T>()(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2));
+}
+}
+=======
+DECLARE_LOGGER(logger, "unity.internal.texturecache");
+namespace
+{
+// Stolen from boost
+template <class T>
+inline std::size_t hash_combine(std::size_t seed, T const& v)
+{
+  return seed ^ (std::hash<T>()(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2));
+}
+}
+>>>>>>> MERGE-SOURCE
 
 TextureCache& TextureCache::GetDefault()
 {

=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2014-09-04 16:47:13 +0000
+++ unity-shared/UnitySettings.cpp	2014-12-08 22:41:57 +0000
@@ -60,8 +60,12 @@
 const std::string GNOME_TEXT_SCALE_FACTOR = "text-scaling-factor";
 
 const int DEFAULT_LAUNCHER_WIDTH = 64;
+<<<<<<< TREE
 const int MINIMUM_DESKTOP_HEIGHT = 800;
 const int GNOME_SETTINGS_CHANGED_WAIT_SECONDS = 1;
+=======
+const int MINIMUM_DESKTOP_HEIGHT = 800;
+>>>>>>> MERGE-SOURCE
 const double DEFAULT_DPI = 96.0f;
 }