summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-08-07 06:14:27 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-08-07 06:14:27 +0200
commit8b464dc6eec4d1fd58875451671456393181e980 (patch)
treee97f998a24620c545711a3692be509768407b75d /.gitignore
parent90118343e46fecac78b6351ce25bb610b15fc077 (diff)
parent8df8a3d7a9d3356183df0a45c97f32dac878b65b (diff)
downloadbarebox-8b464dc6eec4d1fd58875451671456393181e980.tar.gz
Merge branch 'for-next/doc'
Conflicts: Makefile
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index c2e6e9a..a74b6d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,7 +67,6 @@ include/linux/compile.h
include/generated
# Generated files
-Doxyfile.version
Documentation/commands/*.rst
doctrees/