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 12:02:33 +01:00

parent c39a5bbb88 a5dfc41e19

commit aafd72c05b

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