Merge commit '193a358'
authorAaron Plattner <aplattner@nvidia.com>
Sat, 2 Aug 2014 06:10:46 +0000 (23:10 -0700)
committerAaron Plattner <aplattner@nvidia.com>
Sat, 2 Aug 2014 06:10:46 +0000 (23:10 -0700)
commit20d76f773cf8de474cf7a3f1082961605732c3f1
treee63755c11ff7ab471427d8ce319e1e0fe1f9071b
parent00477d88297eaa6c87aa144548590c32540e3928
parent193a358563a59c1a3fc55f55029c605e2419c80b
Merge commit '193a358'

Conflicts:
xrandr.c
xrandr.c