488a9285bf
# Conflicts: # .idea/simplified_radiosity_algorith.iml |
||
---|---|---|
.. | ||
inspectionProfiles | ||
.gitignore | ||
modules.xml | ||
simplified_radiosity_algorith.iml | ||
vcs.xml | ||
workspace.xml |
488a9285bf
# Conflicts: # .idea/simplified_radiosity_algorith.iml |
||
---|---|---|
.. | ||
inspectionProfiles | ||
.gitignore | ||
modules.xml | ||
simplified_radiosity_algorith.iml | ||
vcs.xml | ||
workspace.xml |