diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2015-07-14 19:19:39 +0200 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2015-07-14 19:19:39 +0200 |
| commit | ca970016b7e5176e94eee3af24a70d5b3355018f (patch) | |
| tree | 6e08b30384bfd9ef8c881087bb1a034db10db366 /.vimrc | |
| parent | 73b836e22f6b42308e05df284b90ce2c9cb32af4 (diff) | |
| parent | 4c641e99fa1b32385b941cccccb566f5ddc9daed (diff) | |
Merge commit 'refs/pull/436/head' of https://github.com/systemd/systemd
This merges:
sd-netlink: respect attribute type flags
..fixing a conflict due to a typo fix.
Diffstat (limited to '.vimrc')
0 files changed, 0 insertions, 0 deletions