Skip to content
Snippets Groups Projects
Commit e8a5f040 authored by Christian Darsow-Fromm's avatar Christian Darsow-Fromm
Browse files

Merge branch 'develop'

parents dc5742c3 d0af3353
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
.gitignore
+ 1
− 0
View file @ e8a5f040
...@@ -27,3 +27,4 @@ servos.json ...@@ -27,3 +27,4 @@ servos.json
htmlcov htmlcov
env/ env/
doc/adwin/ doc/adwin/
.venv
AUTHORS.rst
+ 1
− 1
View file @ e8a5f040
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
Contributors Contributors
============ ============
* Christian Darsow-Fromm <christian.darsow@physik.uni-hamburg.de> * Christian Darsow-Fromm <cdarsowf@physnet.uni-hamburg.de>
* Sebastian Steinlechner <sebastian.steinlechner@physnet.uni-hamburg.de> * Sebastian Steinlechner <sebastian.steinlechner@physnet.uni-hamburg.de>
* Luis Dekant <ldekant@physnet.uni-hamburg.de> * Luis Dekant <ldekant@physnet.uni-hamburg.de>
setup.cfg
+ 1
− 1
View file @ e8a5f040
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
name = NQontrol name = NQontrol
description = Python program for digital control-loops. description = Python program for digital control-loops.
author = LasNQ – Uni Hamburg author = LasNQ – Uni Hamburg
author-email = christian.darsow@physik.uni-hamburg.de author-email = cdarsowf@physnet.uni-hamburg.de
license = GPL v3 license = GPL v3
# url = http:// # url = http://
long_description = file: README.md long_description = file: README.md
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment