Commit ec5161cc authored by thomas.forbriger's avatar thomas.forbriger
Browse files

unix [MERGE]: vendor

Merge recent changes of vendor into unix.
parents ee106c19 2fb72b2a
......@@ -12,6 +12,8 @@ updates.
Please check the original location (http://www.software-for-seismometry.de/)
for the most recent versions, binary executables for Windows and accompanying
material.
A UNIX/Linux-version of the software with a few add-ons is available at
http://git.scc.kit.edu/Seitosh/software-for-seismometry-linux.
Source
------
......@@ -59,7 +61,10 @@ Source code is provided on branch `vendor`.
just before next vendor snapshot
`vendor`: vendor import branch (just code, no example data)
`vendor-with-examples`: vendor import with data file examples
`master`: will point to `vendor`
`master`: is a child of `vendor` (additionally contains local
modifications and additions)
`master-with-examples`: is a child of `vendor-with-examples` (additionally
contains local modifications and additions)
`workbench`: separate branch providing tools for vendor imports
### merge hierarchy
......@@ -77,4 +82,4 @@ Thomas Forbriger
email: Thomas.Forbriger@kit.edu
Black Forest Observatory (BFO), Heubach 206, 77709 Wolfach, Germany,
Geophysical Institute, Karlsruhe Institute of Technology (KIT)
http://www.gpi.kit.edu/BFO.php
http://www.gpi.kit.edu/english/BFO.php
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment