]> git.ipfire.org Git - thirdparty/pciutils.git/commit
Merge branch 'dpc'
authorMartin Mares <mj@ucw.cz>
Sat, 14 May 2016 10:02:04 +0000 (12:02 +0200)
committerMartin Mares <mj@ucw.cz>
Sat, 14 May 2016 10:02:04 +0000 (12:02 +0200)
commitc51f8fa45885a739a728d0139ea59c3e17ffcc4e
tree14e4ad5e3ab512ab90b4fbfb58057f9905e33fa6
parent4186391b43bf101fda08e92185359c94812e2c3d
parentde91b6f262456ffc62afe5cff2b4f54ec4b38598
Merge branch 'dpc'

Conflicts:
lib/header.h
lib/header.h
ls-ecaps.c