Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

Browse Source

...

This commit is contained in:

wmayer

2015-04-12 18:39:27 +02:00

parent 8991b9e04b 6685ae0142

commit 3e1e5974f0

97 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

src/Mod/Material/StandardMaterial/Concrete.FCMat → src/Mod/Material/StandardMaterial/Concrete-Generic.FCMat

0

src/Mod/Material/StandardMaterial/15CrNi6.FCMat → src/Mod/Material/StandardMaterial/Steel-15CrNi6.FCMat

0

src/Mod/Material/StandardMaterial/17CrNiMo6.FCMat → src/Mod/Material/StandardMaterial/Steel-17CrNiMo6.FCMat

0

src/Mod/Material/StandardMaterial/1C22.FCMat → src/Mod/Material/StandardMaterial/Steel-1C22.FCMat

0

src/Mod/Material/StandardMaterial/1C35.FCMat → src/Mod/Material/StandardMaterial/Steel-1C35.FCMat

0

src/Mod/Material/StandardMaterial/1C45.FCMat → src/Mod/Material/StandardMaterial/Steel-1C45.FCMat

0

src/Mod/Material/StandardMaterial/1C60.FCMat → src/Mod/Material/StandardMaterial/Steel-1C60.FCMat

0

src/Mod/Material/StandardMaterial/20NiCrMo2.FCMat → src/Mod/Material/StandardMaterial/Steel-20NiCrMo2.FCMat

0

src/Mod/Material/StandardMaterial/28Mn6.FCMat → src/Mod/Material/StandardMaterial/Steel-28Mn6.FCMat

0

src/Mod/Material/StandardMaterial/2C10.FCMat → src/Mod/Material/StandardMaterial/Steel-2C10.FCMat

0

src/Mod/Material/StandardMaterial/30CrNiMo8.FCMat → src/Mod/Material/StandardMaterial/Steel-30CrNiMo8.FCMat

0

src/Mod/Material/StandardMaterial/34CrNiMo6.FCMat → src/Mod/Material/StandardMaterial/Steel-34CrNiMo6.FCMat

0

src/Mod/Material/StandardMaterial/36CrNiMo4.FCMat → src/Mod/Material/StandardMaterial/Steel-36CrNiMo4.FCMat

0

src/Mod/Material/StandardMaterial/36NiCrMo16.FCMat → src/Mod/Material/StandardMaterial/Steel-36NiCrMo16.FCMat

0

src/Mod/Material/StandardMaterial/3C15.FCMat → src/Mod/Material/StandardMaterial/Steel-3C15.FCMat

0

src/Mod/Material/StandardMaterial/3C22.FCMat → src/Mod/Material/StandardMaterial/Steel-3C22.FCMat

0

src/Mod/Material/StandardMaterial/3C35.FCMat → src/Mod/Material/StandardMaterial/Steel-3C35.FCMat

0

src/Mod/Material/StandardMaterial/3V45.FCMat → src/Mod/Material/StandardMaterial/Steel-3V45.FCMat

0

src/Mod/Material/StandardMaterial/AlMg3F24.FCMat → src/Mod/Material/StandardMaterial/Steel-AlMg3F24.FCMat

0

src/Mod/Material/StandardMaterial/AlMgSi1F31.FCMat → src/Mod/Material/StandardMaterial/Steel-AlMgSi1F31.FCMat

0

src/Mod/Material/StandardMaterial/AlZn4.5Mg1F35.FCMat → src/Mod/Material/StandardMaterial/Steel-AlZn4.5Mg1F35.FCMat

0

src/Mod/Material/StandardMaterial/C10.FCMat → src/Mod/Material/StandardMaterial/Steel-C10.FCMat

0

src/Mod/Material/StandardMaterial/C15.FCMat → src/Mod/Material/StandardMaterial/Steel-C15.FCMat

0

src/Mod/Material/StandardMaterial/C22E.FCMat → src/Mod/Material/StandardMaterial/Steel-C22E.FCMat

0

src/Mod/Material/StandardMaterial/C25E.FCMat → src/Mod/Material/StandardMaterial/Steel-C25E.FCMat

0

src/Mod/Material/StandardMaterial/C30E.FCMat → src/Mod/Material/StandardMaterial/Steel-C30E.FCMat

0

src/Mod/Material/StandardMaterial/C40E.FCMat → src/Mod/Material/StandardMaterial/Steel-C40E.FCMat

0

src/Mod/Material/StandardMaterial/C50E.FCMat → src/Mod/Material/StandardMaterial/Steel-C50E.FCMat

0

src/Mod/Material/StandardMaterial/C55E.FCMat → src/Mod/Material/StandardMaterial/Steel-C55E.FCMat

0

src/Mod/Material/StandardMaterial/C60E.FCMat → src/Mod/Material/StandardMaterial/Steel-C60E.FCMat

0

src/Mod/Material/StandardMaterial/E295 GC.FCMat → src/Mod/Material/StandardMaterial/Steel-E295 GC.FCMat

0

src/Mod/Material/StandardMaterial/E295.FCMat → src/Mod/Material/StandardMaterial/Steel-E295.FCMat

0

src/Mod/Material/StandardMaterial/E335 GC.FCMat → src/Mod/Material/StandardMaterial/Steel-E335 GC.FCMat

0

src/Mod/Material/StandardMaterial/E335.FCMat → src/Mod/Material/StandardMaterial/Steel-E335.FCMat

0

src/Mod/Material/StandardMaterial/E360 GC.FCMat → src/Mod/Material/StandardMaterial/Steel-E360 GC.FCMat

0

src/Mod/Material/StandardMaterial/E360.FCMat → src/Mod/Material/StandardMaterial/Steel-E360.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJL-100.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJL-100.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJL-150.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJL-150.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJL-200.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJL-200.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJL-250.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJL-250.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJL-300.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJL-300.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJL-350.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJL-350.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJMB-350-10.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJMB-350-10.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJMB-550-4.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJMB-550-4.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJMB-650-2.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJMB-650-2.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJMW-350-4.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJMW-350-4.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJMW-360-12.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJMW-360-12.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJMW-400-5.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJMW-400-5.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJMW-450-7.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJMW-450-7.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJS-400-15.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJS-400-15.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJS-500-7.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJS-500-7.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJS-600-3.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJS-600-3.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJS-700-2.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJS-700-2.FCMat

0

src/Mod/Material/StandardMaterial/EN-GJS-800-1.FCMat → src/Mod/Material/StandardMaterial/Steel-EN-GJS-800-1.FCMat

0

src/Mod/Material/StandardMaterial/G16Mn5.FCMat → src/Mod/Material/StandardMaterial/Steel-G16Mn5.FCMat

0

src/Mod/Material/StandardMaterial/G200.FCMat → src/Mod/Material/StandardMaterial/Steel-G200.FCMat

0

src/Mod/Material/StandardMaterial/G20Mn5.FCMat → src/Mod/Material/StandardMaterial/Steel-G20Mn5.FCMat

0

src/Mod/Material/StandardMaterial/G230.FCMat → src/Mod/Material/StandardMaterial/Steel-G230.FCMat

0

src/Mod/Material/StandardMaterial/G260.FCMat → src/Mod/Material/StandardMaterial/Steel-G260.FCMat

0

src/Mod/Material/StandardMaterial/G300.FCMat → src/Mod/Material/StandardMaterial/Steel-G300.FCMat

0

src/Mod/Material/StandardMaterial/G30Mn5.FCMat → src/Mod/Material/StandardMaterial/Steel-G30Mn5.FCMat

0

src/Mod/Material/StandardMaterial/Steel.FCMat → src/Mod/Material/StandardMaterial/Steel-Generic.FCMat

0

src/Mod/Material/StandardMaterial/S185.FCMat → src/Mod/Material/StandardMaterial/Steel-S185.FCMat

0

src/Mod/Material/StandardMaterial/S235JO.FCMat → src/Mod/Material/StandardMaterial/Steel-S235JO.FCMat

0

src/Mod/Material/StandardMaterial/S235JR.FCMat → src/Mod/Material/StandardMaterial/Steel-S235JR.FCMat

0

src/Mod/Material/StandardMaterial/S235JRG1.FCMat → src/Mod/Material/StandardMaterial/Steel-S235JRG1.FCMat

0

src/Mod/Material/StandardMaterial/S260NC.FCMat → src/Mod/Material/StandardMaterial/Steel-S260NC.FCMat

0

src/Mod/Material/StandardMaterial/S275JO.FCMat → src/Mod/Material/StandardMaterial/Steel-S275JO.FCMat

0

src/Mod/Material/StandardMaterial/S275JR.FCMat → src/Mod/Material/StandardMaterial/Steel-S275JR.FCMat

0

src/Mod/Material/StandardMaterial/S275N.FCMat → src/Mod/Material/StandardMaterial/Steel-S275N.FCMat

0

src/Mod/Material/StandardMaterial/S335JO.FCMat → src/Mod/Material/StandardMaterial/Steel-S335JO.FCMat

0

src/Mod/Material/StandardMaterial/S335JR.FCMat → src/Mod/Material/StandardMaterial/Steel-S335JR.FCMat

0

src/Mod/Material/StandardMaterial/S335N.FCMat → src/Mod/Material/StandardMaterial/Steel-S335N.FCMat

0

src/Mod/Material/StandardMaterial/S340MC.FCMat → src/Mod/Material/StandardMaterial/Steel-S340MC.FCMat

0

src/Mod/Material/StandardMaterial/S355J2G3.FCMat → src/Mod/Material/StandardMaterial/Steel-S355J2G3.FCMat

0

src/Mod/Material/StandardMaterial/S380MC.FCMat → src/Mod/Material/StandardMaterial/Steel-S380MC.FCMat

0

src/Mod/Material/StandardMaterial/S420MC.FCMat → src/Mod/Material/StandardMaterial/Steel-S420MC.FCMat

0

src/Mod/Material/StandardMaterial/S420N.FCMat → src/Mod/Material/StandardMaterial/Steel-S420N.FCMat

0

src/Mod/Material/StandardMaterial/S460MC.FCMat → src/Mod/Material/StandardMaterial/Steel-S460MC.FCMat

0

src/Mod/Material/StandardMaterial/S460N.FCMat → src/Mod/Material/StandardMaterial/Steel-S460N.FCMat

0

src/Mod/Material/StandardMaterial/S500MC.FCMat → src/Mod/Material/StandardMaterial/Steel-S500MC.FCMat

0

src/Mod/Material/StandardMaterial/S550MC.FCMat → src/Mod/Material/StandardMaterial/Steel-S550MC.FCMat

0

src/Mod/Material/StandardMaterial/S690MC.FCMat → src/Mod/Material/StandardMaterial/Steel-S690MC.FCMat

0

src/Mod/Material/StandardMaterial/St-37-2K.FCMat → src/Mod/Material/StandardMaterial/Steel-St-37-2K.FCMat

0

src/Mod/Material/StandardMaterial/St-E-255.FCMat → src/Mod/Material/StandardMaterial/Steel-St-E-255.FCMat

0

src/Mod/Material/StandardMaterial/St-E-315.FCMat → src/Mod/Material/StandardMaterial/Steel-St-E-315.FCMat

0

src/Mod/Material/StandardMaterial/St-E-380.FCMat → src/Mod/Material/StandardMaterial/Steel-St-E-380.FCMat

0

src/Mod/Material/StandardMaterial/St-E-460.FCMat → src/Mod/Material/StandardMaterial/Steel-St-E-460.FCMat

0

src/Mod/Material/StandardMaterial/St-E-500.FCMat → src/Mod/Material/StandardMaterial/Steel-St-E-500.FCMat

0

src/Mod/Material/StandardMaterial/X2CrNiMoN17-13-3.FCMat → src/Mod/Material/StandardMaterial/Steel-X2CrNiMoN17-13-3.FCMat

0

src/Mod/Material/StandardMaterial/X2CrNiN24-4.FCMat → src/Mod/Material/StandardMaterial/Steel-X2CrNiN24-4.FCMat

0

src/Mod/Material/StandardMaterial/X39CrMo17-1.FCMat → src/Mod/Material/StandardMaterial/Steel-X39CrMo17-1.FCMat

0

src/Mod/Material/StandardMaterial/X3CrNiMo13-14.FCMat → src/Mod/Material/StandardMaterial/Steel-X3CrNiMo13-14.FCMat

0

src/Mod/Material/StandardMaterial/X5CrNi18-10.FCMat → src/Mod/Material/StandardMaterial/Steel-X5CrNi18-10.FCMat

0

src/Mod/Material/StandardMaterial/X5CrNiMo17-12-2.FCMat → src/Mod/Material/StandardMaterial/Steel-X5CrNiMo17-12-2.FCMat

0

src/Mod/Material/StandardMaterial/X6CrNiTi18-10.FCMat → src/Mod/Material/StandardMaterial/Steel-X6CrNiTi18-10.FCMat

0

src/Mod/Material/StandardMaterial/Wood.FCMat → src/Mod/Material/StandardMaterial/Wood-Generic.FCMat