Update to experimental state in master :D #2

Merged
neuron303 merged 24 commits from master into master 2019-09-23 15:19:47 +02:00
9 changed files with 18 additions and 67 deletions
Showing only changes of commit 1fb31a4ec2 - Show all commits

2
.gitignore vendored
View File

@@ -27,6 +27,7 @@ Makefile*
*.prl *.prl
*.app *.app
moc_*.cpp moc_*.cpp
moc_*.h
ui_*.h ui_*.h
qrc_*.cpp qrc_*.cpp
Thumbs.db Thumbs.db
@@ -70,4 +71,5 @@ Thumbs.db
# -------- # --------
*.dll *.dll
*.exe *.exe
oscilloscope