]> git.donarmstrong.com Git - deb_pkgs/autorandr.git/commit
Merge remote-tracking branch 'queezythegreat/master'
authorPhillip Berndt <phillip.berndt@googlemail.com>
Mon, 2 Dec 2013 09:50:40 +0000 (10:50 +0100)
committerPhillip Berndt <phillip.berndt@googlemail.com>
Mon, 2 Dec 2013 09:50:40 +0000 (10:50 +0100)
commit43bb98c613862cdf8cb81a49a03b30f70c706816
treed9b4e082f479f847f4eb5f56e790a36446ddda25
parentfb01d5e870d95c8dcd1006dcec0e825086332743
parent2509ac3b83b4b4ee16c4a4af34b0138a2c95a3c6
Merge remote-tracking branch 'queezythegreat/master'

Conflicts:
Makefile
Makefile
contrib/autorandr_monitor/Xsession.d/autorandr
contrib/autorandr_monitor/autorandr_monitor