Merge remote-tracking branch 'origin/master'

This commit is contained in:
psy 2019-06-02 17:26:59 +02:00
commit 8c00209ec3
1 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
.idea/
cmake-build-debug/