Skip to content
Snippets Groups Projects
Commit a4a19b6c authored by Provot Bertrand's avatar Provot Bertrand
Browse files

Merge branch 'dev2018' of github.com:eiimage/eiimage into dev2018

parents 6fa6bf8e a6946313
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 1 deletion
.gitignore
+ 5
− 1
View file @ a4a19b6c
......@@ -37,4 +37,8 @@ Makefile
CMakeLists.txt.user*
##Build dir
build
\ No newline at end of file
build
##working files
.vscode
*.diff
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment