xrandr: Changes to 'master'

[Aaron Plattner]

 configure.ac |    2 +-
 xrandr.c     |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9887ed4989e0abd48004598be0eb5cb06fa40bd1
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Aug 1 23:14:42 2014 -0700

    xrandr 1.4.3
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

commit 20d76f773cf8de474cf7a3f1082961605732c3f1
Merge: 00477d8 193a358
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Aug 1 23:10:46 2014 -0700

    Merge commit '193a358'
    
    Conflicts:
    	xrandr.c

commit 193a358563a59c1a3fc55f55029c605e2419c80b
Author: Stéphane Aulery <lkppo at free.fr>
Date:   Sat Jun 29 16:50:25 2013 -0700

    Mention of --brightness with -h option
    
    Reported by jidanni at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709569
    
    Signed-off-by: Stéphane Aulery <lkppo at free.fr>
    Reviewed-By: Matt Dew <marcoz at osource.org>
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>