Merge branch 'master' of https://github.com/jkriege2/JKQtPlotter

Browse Source

# Conflicts:
#	.travis.yml

...

This commit is contained in:

Jan W. Krieger 2019-01-15 13:17:26 +01:00

parent 76bae98c9c 7a8259b0f0

commit 441da428e4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available