Merge branch 'master' into makefile-refactor
authorChris Hanson <org/chris-hanson/cph>
Tue, 23 Oct 2018 21:12:52 +0000 (14:12 -0700)
committerChris Hanson <org/chris-hanson/cph>
Tue, 23 Oct 2018 21:12:52 +0000 (14:12 -0700)
commit045baa9c929f4f273325c73886fcedcf10f34c6c
tree441fedd2fa97696795ba6fe4e62fab4bb9ac024d
parentb2c53245471c82aa3d6f8d8d5365de9c44c8ccc7
parent3fab110bc5d8e5d050889c1eb301440d27b186b6
Merge branch 'master' into makefile-refactor
src/x11/Makefile.am
src/x11/configure.ac