]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
projects / thirdparty / util-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69dee22 59b94cc)
Merge branch '2017wk11' of git://github.com/kerolasa/lelux-utiliteetit
authorKarel Zak <kzak@redhat.com>
Fri, 24 Mar 2017 10:59:57 +0000 (11:59 +0100)
committerKarel Zak <kzak@redhat.com>
Fri, 24 Mar 2017 10:59:57 +0000 (11:59 +0100)
* '2017wk11' of git://github.com/kerolasa/lelux-utiliteetit:
  blkid: add control struct
  blkid: simplify version option handling
  tests: add static keyword where needed [smatch scan]
  tests: do not use plain 0 as NULL [smatch scan]
  libsmartcols: fix test variable shadowing


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.