Changed all doxycomments with \ to @
Fixed merge conflict in dacc.h