x11-screen: fix merge
authorMatt Birkholz <puck@birchwood-abbey.net>
Sat, 12 Nov 2016 20:43:09 +0000 (13:43 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Sat, 12 Nov 2016 20:43:09 +0000 (13:43 -0700)
commit45b2d9bfc87d970850fe6f26c81f356fcbba03ea
tree9def8053706936906fca7f3a82ebcdcf82151acf
parent53d9c3ad695940ce33fd4d68fb7f5248abee378d
x11-screen: fix merge
src/x11-screen/configure.ac