Merge branch 'master' of https://github.com/coolprop/coolprop

Browse Source

Conflicts:
	dev/buildbot/master/master.cfg

...

This commit is contained in:

Ian Bell

2014-08-08 19:53:06 +02:00

parent 74997dfda3 470e4ca814

commit 3c1aa4f19b

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

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

Diff Content Not Available