Merge branch TeamCMU the 2nd

2017-12-06 21:26:06 +01:00
parent f0e287af20
commit 0469915cd9
3 changed files with 41 additions and 42 deletions
@@ -35,10 +35,9 @@
 # CLion folder
 Source/.idea/*
 Source/cmake-build-debug/*
+Source/.DS_Store
+Source/CMakeLists.txt
 cmake-build-debug
 .idea
 .DS_Store

-Source/.idea/workspace.xml
-Source/.idea/workspace.xml
-Source/.idea/workspace.xml