Viewing all changes in revision 247.

Committer: Tarmac
Author(s): Alberto Aguirre
Date: 2015-08-24 19:09:13 UTC
mfrom: <a title="Merged From 246.1.2" href="/~afrantzis/unity-system-compositor/sync-with-0.1.3/revision/246.1.2">(246.1.2 another-proxmity-fix)
Revision ID: tarmac-20150824190913-14t86lrigaalbdi8

Also allow proximity to turn screen on, after an inactivity event turned it off.

Approved by Kevin DuBois, PS Jenkins bot.

added added

removed removed