summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-07-02 12:05:46 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-07-02 12:05:46 (GMT)
commit3fd821c28b41a8bdc97d575dfe2425101c3eb3e6 (patch)
tree5a363c283c9c9e2d579d821a929e6a264e9d6ff1 /.gitignore
parent10dc9dd585b220c7880d11095075276394199b1d (diff)
parent78b905a4b20a0156f59cf950c53182464ebf3d5e (diff)
downloadDoxygen-3fd821c28b41a8bdc97d575dfe2425101c3eb3e6.zip
Doxygen-3fd821c28b41a8bdc97d575dfe2425101c3eb3e6.tar.gz
Doxygen-3fd821c28b41a8bdc97d575dfe2425101c3eb3e6.tar.bz2
Merge branch 'master' of https://github.com/pepr/doxygen into pepr
Conflicts: src/libdoxygen.pro.in winbuild/Doxygen.vcproj
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4e46537..b1a5bdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ Makefile
/src/pyscanner.cpp
/src/scanner.cpp
/src/tclscanner.cpp
+/src/unistd.h
/src/version.cpp
/src/vhdlcode.cpp
/src/vhdlparser.cpp