Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop

Browse Source

Conflicts:
	icons/Matlab_PILOT_icon.png

...

This commit is contained in:

Ludger Küperkoch

2017-06-28 23:11:16 +02:00

parent e7bd1c8d31 aff08d3a9c

commit 12e383738d

6 changed files with 6855 additions and 3100 deletions

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

BIN

icons/Matlab_PILOT_icon.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 30 KiB

BIN

icons/parameter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 38 KiB

BIN

icons/preferences.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 38 KiB