Merge remote-tracking branch 'refs/remotes/origin/wmayer/pcl-testing' into jriegel/NewWinBuild
Conflicts: src/Mod/Points/App/CMakeLists.txt src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
#include "PreCompiled.h"
|
||||
#ifndef _PreComp_
|
||||
#endif
|
||||
|
||||
|
||||
#include <Base/Console.h>
|
||||
#include <Base/Interpreter.h>
|
||||
#include <Base/FileInfo.h>
|
||||
@@ -168,3 +168,4 @@ struct PyMethodDef Points_Import_methods[] = {
|
||||
|
||||
{NULL, NULL} /* end of table marker */
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user