zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
Files
993593aa83dfbe4b26c5ee0c86d9505f348c4d8d
CFDEMcoupling-PFM/applications
History
Daniel Queteschiner 96c621416d Merge branch 'develop' into feature/recurrenceLib 
# Conflicts:
#	src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
#	src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
2019-10-22 19:44:00 +02:00
..
solvers
Merge branch 'develop' into feature/recurrenceLib
2019-10-22 19:44:00 +02:00
utilities
Merge tag '19.02' into feature/recurrenceLib
2019-10-22 17:24:33 +02:00
.gitignore
release on 2015-01-05_13-56-45
2015-01-05 13:56:45 +01:00