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

Browse Source

# Conflicts:
#	examples/simpletest_datastore/README.md
#	examples/simpletest_datastore/jkqtplotter_simpletest_datastore.cpp
#	lib/jkqtplotter/jkqtpdatastorage.h

...

This commit is contained in:

jkriege2 2019-05-16 21:30:36 +02:00

parent 56e54baee9 4d5bf37bc8

commit 0a15580306

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