Author |
Committer |
Branch |
Timestamp |
Parent |
yorik |
yorik |
master |
2020-09-09 12:26:11 |
master b06c38a2 |
Changeset |
Merge branch 'master' of github.com:FreeCAD/FreeCAD into master |
add - BUILD_OSX.md |
Diff
File
|
add - build_unix_dev_conda.sh |
Diff
File
|
mod - cMake/FindNETGEN.cmake |
Diff
File
|
mod - cMake/FindPySide2Tools.cmake |
Diff
File
|
mod - cMake/FreeCAD_Helpers/PrintFinalReport.cmake |
Diff
File
|
add - conda/bld.bat |
Diff
File
|
add - conda/build.sh |
Diff
File
|
add - conda/conda_build_config.yaml |
Diff
File
|
add - conda/cross-linux.cmake |
Diff
File
|
add - conda/meta.yaml |
Diff
File
|
add - conda/windows_python_interface.patch |
Diff
File
|
add - conda/yum_requirements.txt |
Diff
File
|
add - environment-linux.yml |
Diff
File
|
add - environment-osx.yml |
Diff
File
|
mod - package/fedora/freecad.spec |
Diff
File
|
mod - src/3rdParty/salomesmesh/CMakeLists.txt |
Diff
File
|
mod - src/3rdParty/salomesmesh/inc/NETGENPlugin_Mesher.hxx |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp |
Diff
File
|
mod - src/App/Application.cpp |
Diff
File
|
mod - src/App/Document.cpp |
Diff
File
|
mod - src/App/DocumentObserver.cpp |
Diff
File
|
mod - src/App/DocumentObserver.h |
Diff
File
|
mod - src/App/DocumentPyImp.cpp |
Diff
File
|
mod - src/App/Expression.cpp |
Diff
File
|
mod - src/App/FreeCADInit.py |
Diff
File
|
mod - src/App/GeoFeatureGroupExtension.cpp |
Diff
File
|
mod - src/App/OriginGroupExtension.cpp |
Diff
File
|
mod - src/App/OriginGroupExtension.h |
Diff
File
|
mod - src/App/PropertyLinks.cpp |
Diff
File
|
mod - src/Base/BoundBox.h |
Diff
File
|
mod - src/Base/CMakeLists.txt |
Diff
File
|
mod - src/Base/Exception.cpp |
Diff
File
|
mod - src/Base/Exception.h |
Diff
File
|
mod - src/Base/InputSource.h |
Diff
File
|
mod - src/Base/Interpreter.cpp |
Diff
File
|
mod - src/Base/Interpreter.h |
Diff
File
|
mod - src/Base/Parameter.cpp |
Diff
File
|
mod - src/Base/PyObjectBase.h |
Diff
File
|
mod - src/Base/Reader.cpp |
Diff
File
|
mod - src/Base/Unit.h |
Diff
File
|
mod - src/Base/UnitsApi.cpp |
Diff
File
|
mod - src/Base/UnitsSchema.h |
Diff
File
|
add - src/Base/UnitsSchemaFemMilliMeterNewton.cpp |
Diff
File
|
add - src/Base/UnitsSchemaFemMilliMeterNewton.h |
Diff
File
|
mod - src/Base/UnitsSchemaImperial1.cpp |
Diff
File
|
mod - src/Base/ViewProj.cpp |
Diff
File
|
mod - src/Base/ViewProj.h |
Diff
File
|
mod - src/Base/Writer.cpp |
Diff
File
|
mod - src/Ext/freecad/CMakeLists.txt |
Diff
File
|
mod - src/Ext/freecad/__init__.py.template |
Diff
File
|
mod - src/Gui/3Dconnexion/3DConnexion.xml |
Diff
File
|
mod - src/Gui/3Dconnexion/GuiNativeEventMac.cpp |
Diff
File
|
mod - src/Gui/3Dconnexion/GuiNativeEventMac.h |
Diff
File
|
mod - src/Gui/Action.cpp |
Diff
File
|
mod - src/Gui/Action.h |
Diff
File
|
mod - src/Gui/Application.cpp |
Diff
File
|
mod - src/Gui/Application.h |
Diff
File
|
mod - src/Gui/ApplicationPy.cpp |
Diff
File
|
mod - src/Gui/BitmapFactory.cpp |
Diff
File
|
mod - src/Gui/BitmapFactory.h |
Diff
File
|
mod - src/Gui/BlenderNavigationStyle.cpp |
Diff
File
|
mod - src/Gui/CADNavigationStyle.cpp |
Diff
File
|
mod - src/Gui/CMakeLists.txt |
Diff
File
|
mod - src/Gui/Clipping.cpp |
Diff
File
|
mod - src/Gui/Clipping.h |
Diff
File
|
mod - src/Gui/Clipping.ui |
Diff
File
|
mod - src/Gui/Command.cpp |
Diff
File
|
mod - src/Gui/CommandDoc.cpp |
Diff
File
|
add - src/Gui/CommandPy.xml |
Diff
File
|
add - src/Gui/CommandPyImp.cpp |
Diff
File
|
mod - src/Gui/CommandStd.cpp |
Diff
File
|
mod - src/Gui/CommandView.cpp |
Diff
File
|
mod - src/Gui/DlgCommandsImp.cpp |
Diff
File
|
mod - src/Gui/DlgCustomizeSpaceball.cpp |
Diff
File
|
mod - src/Gui/DlgCustomizeSpaceball.h |
Diff
File
|
mod - src/Gui/DlgExpressionInput.cpp |
Diff
File
|
mod - src/Gui/DlgExpressionInput.h |
Diff
File
|
mod - src/Gui/DlgMacroExecuteImp.cpp |
Diff
File
|
mod - src/Gui/DlgParameterImp.cpp |
Diff
File
|
mod - src/Gui/DlgReportView.ui |
Diff
File
|
mod - src/Gui/DlgReportViewImp.cpp |
Diff
File
|
mod - src/Gui/DlgSettingsMacro.ui |
Diff
File
|
mod - src/Gui/DlgSettingsMacroImp.cpp |
Diff
File
|
mod - src/Gui/DlgSettingsMacroImp.h |
Diff
File
|
mod - src/Gui/DlgSettingsUnitsImp.cpp |
Diff
File
|
mod - src/Gui/DlgToolbarsImp.cpp |
Diff
File
|
mod - src/Gui/Document.cpp |
Diff
File
|
mod - src/Gui/DocumentObserver.cpp |
Diff
File
|
mod - src/Gui/DocumentObserver.h |
Diff
File
|
mod - src/Gui/DocumentPyImp.cpp |
Diff
File
|
mod - src/Gui/DocumentRecovery.cpp |
Diff
File
|
mod - src/Gui/ExpressionBinding.h |
Diff
File
|
mod - src/Gui/FreeCADGuiInit.py |
Diff
File
|
mod - src/Gui/GestureNavigationStyle.cpp |
Diff
File
|
mod - src/Gui/InventorAll.h |
Diff
File
|
mod - src/Gui/InventorNavigationStyle.cpp |
Diff
File
|
mod - src/Gui/Language/FreeCAD_af.qm |
Diff
File
|
mod - src/Gui/Language/FreeCAD_af.ts |
Diff
File
|