]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #191 from kaysievers/resolv
authorDavid Herrmann <dh.herrmann@googlemail.com>
Sun, 14 Jun 2015 11:09:06 +0000 (13:09 +0200)
committerDavid Herrmann <dh.herrmann@googlemail.com>
Sun, 14 Jun 2015 11:09:06 +0000 (13:09 +0200)
build-sys: merge convenience library libresolve

1  2 
Makefile.am

diff --cc Makefile.am
Simple merge