Skip to content
Snippets Groups Projects
Commit 4a20aff0 authored by David Schiebener's avatar David Schiebener
Browse files

Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

parents a0cdcdfc 2ea4fdac
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
.gitignore
+ 1
− 1
View file @ 4a20aff0
......@@ -17,7 +17,7 @@ source/*/Test.h
.DS_Store
CMakeFiles
CMakeCache.txt
CMakeLists.txt.user
CMakeLists.txt.user*
*.o
*.os
......
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