Merge branch TeamCMU the 2nd

This commit is contained in:
d-kaselautzke 2017-12-06 21:26:06 +01:00
parent f0e287af20
commit 0469915cd9
3 changed files with 41 additions and 42 deletions

5
.gitignore vendored
View File

@ -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

BIN
Codicil/Images/Balloons.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 519 KiB

BIN
Codicil/Images/tiger.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 654 KiB