summaryrefslogtreecommitdiffstats
path: root/staging_vespalib/src/.gitignore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-06-12 11:48:38 +0200
committerGitHub <noreply@github.com>2018-06-12 11:48:38 +0200
commit23d9213d4f58410cd78410dc10950b3bab86c563 (patch)
tree68f4e14449fe5581fde1a950380286c3d973e3f5 /staging_vespalib/src/.gitignore
parent49ea989662f402f6c96737636b497724a4bb457f (diff)
parent06d3ba8c9e0edea16dafce70c13280330c4ab59f (diff)
Merge branch 'master' into balder/reduce-code-visibility-rebased
Diffstat (limited to 'staging_vespalib/src/.gitignore')
-rw-r--r--staging_vespalib/src/.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/staging_vespalib/src/.gitignore b/staging_vespalib/src/.gitignore
index eadbd940e1c..7871665637b 100644
--- a/staging_vespalib/src/.gitignore
+++ b/staging_vespalib/src/.gitignore
@@ -1,5 +1,4 @@
*.dsp
-*.mak
Makefile.ini
config_command.sh
project.dsw