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 /winbuild/Doxygen.vcproj | |
| 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 'winbuild/Doxygen.vcproj')
| -rw-r--r-- | winbuild/Doxygen.vcproj | 50 |
1 files changed, 3 insertions, 47 deletions
diff --git a/winbuild/Doxygen.vcproj b/winbuild/Doxygen.vcproj index 45ba3e1..1822438 100644 --- a/winbuild/Doxygen.vcproj +++ b/winbuild/Doxygen.vcproj @@ -3167,11 +3167,11 @@ </FileConfiguration> </File> <File - RelativePath="..\src\store.cpp" + RelativePath="..\src\sqlite3gen.cpp" > </File> <File - RelativePath="..\src\sqlite3gen.cpp" + RelativePath="..\src\store.cpp" > </File> <File @@ -3261,47 +3261,7 @@ <File RelativePath="..\src\tooltip.cpp" > - </File> - <File - RelativePath="..\src\translator.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> + </File> <File RelativePath="..\src\util.cpp" > @@ -4190,10 +4150,6 @@ > </File> <File - RelativePath="..\src\translatordecoder.h" - > - </File> - <File RelativePath="..\src\unistd.h" > <FileConfiguration |