diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2013-07-02 12:05:46 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-07-02 12:05:46 (GMT) |
| commit | 3fd821c28b41a8bdc97d575dfe2425101c3eb3e6 (patch) | |
| tree | 5a363c283c9c9e2d579d821a929e6a264e9d6ff1 /src/libdoxygen.pro.in | |
| parent | 10dc9dd585b220c7880d11095075276394199b1d (diff) | |
| parent | 78b905a4b20a0156f59cf950c53182464ebf3d5e (diff) | |
| download | Doxygen-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 'src/libdoxygen.pro.in')
| -rw-r--r-- | src/libdoxygen.pro.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in index 6e41c3f..2140a8e 100644 --- a/src/libdoxygen.pro.in +++ b/src/libdoxygen.pro.in @@ -259,8 +259,7 @@ SOURCES = arguments.cpp \ tagreader.cpp \ tclscanner.cpp \ textdocvisitor.cpp \ - tooltip.cpp \ - translator.cpp \ + tooltip.cpp \ util.cpp \ version.cpp \ vhdlcode.cpp \ |