]> granicus.if.org Git - procps-ng/commit
projects / procps-ng / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fb6d4e6) | patch
sysctl: finalizing the GLOB_* flags check
authorJaromir Capik <jcapik@redhat.com>
Thu, 28 Aug 2014 13:48:29 +0000 (15:48 +0200)
committerJaromir Capik <jcapik@redhat.com>
Thu, 28 Aug 2014 13:48:29 +0000 (15:48 +0200)
commitcbd8cf7829919f38895f25c0851afe1f13395f39
tree0321ee2363ffb47be96f4e2e40c97cc185f73daetree | snapshot
parentfb6d4e6cb42ffacfbe300021f062b5057ba7015dcommit | diff
sysctl: finalizing the GLOB_* flags check

This commit properly resolves the merge conflict
caused by the following two commits:
fb6d4e6cb42ffacfbe300021f062b5057ba7015d
f8128568d671d2c07b7d2faf0bc399fb9b7bd69e
sysctl.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.