diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2018-06-20 09:48:02 +0200 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2018-06-20 09:48:02 +0200 |
| commit | 44fc1380b66867958f89c47ac8752926b3787a4d (patch) | |
| tree | ea324d387b055c3ccf0921f9f973c95b16bad2e2 /vespalib | |
| parent | 016e584f0ad5a071e13d75eb8ad5ddb46b8c54f5 (diff) | |
| parent | 79e7562d34a20ed28621a9ec0dc296eda0881428 (diff) | |
Merge branch 'master' into arnej/use-log-abort
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/vespa/vespalib/component/.gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/vespalib/src/vespa/vespalib/component/.gitignore b/vespalib/src/vespa/vespalib/component/.gitignore index 75fec0dcbdd..583460ae288 100644 --- a/vespalib/src/vespa/vespalib/component/.gitignore +++ b/vespalib/src/vespa/vespalib/component/.gitignore @@ -1,4 +1,3 @@ *.So .depend Makefile -getversion |