Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase

2017-12-20 23:03:49 +01:00
parent 37eed7ef88 60e57b9ae0
commit 9720613543
9 changed files with 15 additions and 8 deletions
--- a/Source/functions/AbstractionLayers/DestructionPower/DestructionPower_Properties.h
+++ b/Source/functions/AbstractionLayers/DestructionPower/DestructionPower_Properties.h
@ -44,4 +44,4 @@ map<int,float> DestructionPower_Properties::create_SpeedTable()
    return m;
 }

-#endif //SOURCE_ABSTRACTIONLAYER_1_PROPERTIES_H
+#endif //SOURCE_DESTRUCTIONPOWER_PROPERTIES_H