Merge branch 'wip/meson'
authorMike Gorse <mgorse@linux-e5s4.suse>
Wed, 14 Jun 2017 00:36:55 +0000 (19:36 -0500)
committerMike Gorse <mgorse@linux-e5s4.suse>
Wed, 14 Jun 2017 00:36:55 +0000 (19:36 -0500)
1  2 
configure.ac

diff --cc configure.ac
Simple merge