| Author | 
Committer | 
Branch | 
Timestamp | 
Parent | 
| jriegel | 
jriegel | 
master | 
2014-11-29 15:43:19 | 
master 7d30060c | 
| 
	Changeset | 
Merge branch 'refs/heads/master' into review-CL-Bundler | 
| rm - Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - acinclude.m4 | 
	
		Diff	
	
		File	
 | 
| rm - autogen.sh | 
	
		Diff	
	
		File	
 | 
| rm - build.sh | 
	
		Diff	
	
		File	
 | 
| mod - cMake/FindPySideTools.cmake | 
	
		Diff	
	
		File	
 | 
| rm - configure.ac | 
	
		Diff	
	
		File	
 | 
| rm - data/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - data/examples/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - mkinstalldirs | 
	
		Diff	
	
		File	
 | 
| rm - src/3rdParty/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/3rdParty/Pivy/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/3rdParty/salomesmesh/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| mod - src/App/PropertyStandard.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/App/PropertyUnits.cpp | 
	
		Diff	
	
		File	
 | 
| rm - src/Base/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Build/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Doc/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Gui/Icons/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Gui/Language/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Gui/TaskView/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Gui/iisTaskPanel/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Gui/propertyeditor/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Main/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Makefile.am | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Arch/ArchSectionPlane.py | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Arch/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Assembly/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Assembly/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Assembly/Gui/Resources/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Assembly/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Cam/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Cam/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Cam/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Complete/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Complete/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Complete/Gui/Resources/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Complete/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Draft/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Drawing/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Drawing/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Drawing/Gui/Resources/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Drawing/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Drawing/Templates/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Fem/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Fem/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Fem/Gui/Resources/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Fem/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Idf/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Image/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Image/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Image/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Import/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Import/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Import/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Inspection/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Inspection/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Inspection/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/JtReader/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/JtReader/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Mesh/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Mesh/App/Mesh.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Mesh/App/MeshTestsApp.py | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Mesh/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Mesh/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/MeshPart/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/MeshPart/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/MeshPart/Gui/Resources/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/MeshPart/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/OpenSCAD/Makefile.am | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/OpenSCAD/importCSG.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/OpenSCAD/tokrules.py | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Part/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Part/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Part/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/PartDesign/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/PartDesign/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/PartDesign/Gui/Resources/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/PartDesign/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/PartDesign/Scripts/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Plot/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Points/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Points/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Points/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Raytracing/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Raytracing/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Raytracing/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Raytracing/Templates/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/ReverseEngineering/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/ReverseEngineering/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/ReverseEngineering/Gui/Resources/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/ReverseEngineering/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Robot/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Robot/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Robot/Gui/Resources/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Robot/Lib/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Robot/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Sandbox/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Sandbox/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Sandbox/Makefile.am | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Sandbox/exportDRAWEXE.py | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Ship/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Sketcher/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Sketcher/App/freegcs/Makefile.am | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Sketcher/Gui/Command.cpp | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Sketcher/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Sketcher/Gui/Resources/Makefile.am | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Sketcher/Gui/Resources/Sketcher.qrc | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MergeSketch.svg | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Sketcher/Gui/Workbench.cpp | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Sketcher/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Sketcher/Templates/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Start/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Start/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Start/Gui/Resources/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Start/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Start/StartPage/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/TemplatePyMod/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Test/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Test/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Web/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Web/Gui/Resources/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Mod/Web/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Tools/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Tools/_TEMPLATE_/App/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Tools/_TEMPLATE_/Gui/Makefile.am | 
	
		Diff	
	
		File	
 | 
| rm - src/Tools/_TEMPLATE_/Makefile.am | 
	
		Diff	
	
		File	
 |