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:24:44 +01:00

parent e58fba3fe2 fa6a7597c5

commit 26e5d0dc53

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