Skip to content
Snippets Groups Projects
Commit 8b79b913 authored by Klaus Zenker (HZDR)'s avatar Klaus Zenker (HZDR)
Browse files

Merge remote-tracking branch 'origin/master' into 

device_support_for_history
parents 882cc191 add92d19
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
.gitignore
+ 2
− 0
View file @ 8b79b913
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
###################### ######################
build build
.project .project
.cproject
.settings
.kdev4 .kdev4
*.kdev4 *.kdev4
.vscode .vscode
......
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

imprint | privacy | Conditions of Use