Merge branch 'master' of https://github.com/pepr/doxygen into pepr
Conflicts: src/libdoxygen.pro.in winbuild/Doxygen.vcproj
Showing
src/translator.cpp
deleted
100644 → 0
Please register or sign in to comment
Conflicts: src/libdoxygen.pro.in winbuild/Doxygen.vcproj